From 700ed998e347c220c1a857376624f073bdbcc4a2 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 13 Aug 2024 11:27:59 +0800 Subject: [PATCH 01/30] =?UTF-8?q?=E5=88=B0=E5=BA=93=E4=BD=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81-=E9=BB=98=E8=AE=A4=E5=B8=A6=E5=87=BA=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=BA=93=E4=BD=8D-gaojs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMainOKHOLD/index.vue | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index 499e908c3..7ddee302a 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -88,6 +88,7 @@ import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveReq import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain' import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import * as LocationApi from '@/api/wms/location' // 库存转移申请 defineOptions({ name: 'InventorymoveRequestMain' }) @@ -336,7 +337,32 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { const updataTableColumns = (val) => { tableColumns.value = val } - +// 物料隔离-获取到库位默认值 +const getDefaultToLocationCode = async ()=>{ + let searchCondition = [] + InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { + if(item.field == "toLocationCode"){ + searchCondition = item.tableForm.searchCondition + } + }) + let params = {} + searchCondition.forEach(item=>{ + if(item['isMainValue']){ + params[item['key']] = formRef.value.formRef.formModel[item['value']] + }else{ + params[item['key']] = item['value'] + } + }) + let res = await LocationApi.selectBusinessTypeToLocation(params) + console.log('res',res) + if(res&&res.list.length>0){ + tableData.value.forEach(item=>{ + if(!item['toLocationCode']){ + item['toLocationCode'] = res.list[0]['code'] + } + }) + } +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { @@ -371,6 +397,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } tableData.value.push(newRow) }) + if(routeName.value == 'OktoholdRequestMain'){ + getDefaultToLocationCode() + } } else { row[formField] = val[0][searchField] } From 1fd081746fd198c9a2a482e05ce1d3580ddd6fd5 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 11:28:09 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=BB=BA=E6=A8=A1?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/tenant/index.vue | 4 +++- .../wms/basicDataManage/factoryModeling/areabasic/index.vue | 5 +++-- src/views/wms/basicDataManage/factoryModeling/dock/index.vue | 5 +++-- .../wms/basicDataManage/factoryModeling/enterprise/index.vue | 3 ++- .../wms/basicDataManage/factoryModeling/location/index.vue | 5 +++-- .../basicDataManage/factoryModeling/locationgroup/index.vue | 5 +++-- .../wms/basicDataManage/factoryModeling/process/index.vue | 5 +++-- .../basicDataManage/factoryModeling/productionline/index.vue | 5 +++-- .../wms/basicDataManage/factoryModeling/warehouse/index.vue | 5 +++-- .../wms/basicDataManage/factoryModeling/workshop/index.vue | 5 +++-- .../basicDataManage/factoryModeling/workstation/index.vue | 5 +++-- 11 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index e2650dbe4..aba13417d 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -104,6 +104,8 @@ import download from '@/utils/download' import * as TenantApi from '@/api/system/tenant' import * as TenantPackageApi from '@/api/system/tenantPackage' import TenantForm from './TenantForm.vue' +import { formatDate } from '@/utils/formatTime' +const route = useRoute() //路由信息 defineOptions({ name: 'SystemTenant' }) @@ -177,7 +179,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await TenantApi.exportTenant(queryParams) - download.excel(data, '租户列表.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue index 6be85ba6b..b6f94685a 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue @@ -68,6 +68,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Area' }) @@ -247,7 +248,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await AreaApi.exportArea(tableObject.params) - download.excel(data, '库区.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -262,7 +263,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '库区导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue index 9adc80970..d002a2475 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue @@ -70,6 +70,7 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Dock' }) @@ -261,7 +262,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await DockApi.exportDock(tableObject.params) - download.excel(data, '月台.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -276,7 +277,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '月台导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue index 2567a8018..14700c5cb 100644 --- a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue @@ -59,6 +59,7 @@ import download from '@/utils/download' import { Enterprise,EnterpriseRules } from './enterprise.data' import * as EnterpriseApi from '@/api/wms/enterprise' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Enterprise' }) @@ -229,7 +230,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await EnterpriseApi.exportEnterprise(tableObject.params) - download.excel(data, '企业.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/basicDataManage/factoryModeling/location/index.vue b/src/views/wms/basicDataManage/factoryModeling/location/index.vue index 98f0c1283..2ac2ee173 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/location/index.vue @@ -66,6 +66,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' // 基础信息——库位 defineOptions({ name: 'Location' }) @@ -265,7 +266,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await LocationApi.exportLocation(tableObject.params) - download.excel(data, '库位.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -280,7 +281,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '库位导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue index db65ec6f0..40785ee97 100644 --- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue @@ -66,6 +66,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' // 库位组管理 defineOptions({ name: 'Locationgroup' }) @@ -246,7 +247,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await LocationgroupApi.exportLocationgroup(tableObject.params) - download.excel(data, '库位组.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -261,7 +262,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '库位组导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue index b112d1837..40731066f 100644 --- a/src/views/wms/basicDataManage/factoryModeling/process/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue @@ -66,6 +66,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Process' }) @@ -253,7 +254,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProcessApi.exportProcess(tableObject.params) - download.excel(data, '工序.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -268,7 +269,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '工序导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue index b1a2b22cd..3a916a03c 100644 --- a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue @@ -66,6 +66,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' // 生产线管理 defineOptions({ name: 'Productionline' }) @@ -246,7 +247,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionlineApi.exportProductionline(tableObject.params) - download.excel(data, '生产线.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -261,7 +262,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '生产线导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue index bc20bb421..c1549165d 100644 --- a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Warehouse' }) @@ -226,7 +227,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await WarehouseApi.exportWarehouse(tableObject.params) - download.excel(data, '仓库.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -241,7 +242,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '仓库导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue index f086a1428..3a8fc9f96 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Workshop' }) @@ -228,7 +229,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await WorkshopApi.exportWorkshop(tableObject.params) - download.excel(data, '车间.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -243,7 +244,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '车间导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue index 5c963542e..d200d5f0a 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue @@ -66,6 +66,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' // 工位管理 defineOptions({ name: 'Workstation' }) @@ -255,7 +256,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await WorkstationApi.exportWorkstation(tableObject.params) - download.excel(data, '工位.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -270,7 +271,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '工位导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { From 4f3ac6e1b8314d42bc7900543d59e0966677d5a5 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 13 Aug 2024 11:32:12 +0800 Subject: [PATCH 03/30] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=BA=94=E8=AF=A5=E5=8F=AF=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E4=B8=AD=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=9A=84=E5=85=A5=E5=BA=93=E5=BA=93=E5=8C=BA=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=89=8D=E5=8F=AA=E6=9C=89=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 87e930fa3..97ccff14f 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -664,7 +664,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive Date: Tue, 13 Aug 2024 11:51:29 +0800 Subject: [PATCH 04/30] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/serialNumber/index.vue | 5 ++++- .../basicDataManage/documentSetting/businesstype/index.vue | 5 +++-- .../documentSetting/documentsetting/index.vue | 5 +++-- .../wms/basicDataManage/documentSetting/jobsetting/index.vue | 5 +++-- .../basicDataManage/documentSetting/plansetting/index.vue | 5 +++-- .../basicDataManage/documentSetting/recordsetting/index.vue | 5 +++-- .../basicDataManage/documentSetting/requestsetting/index.vue | 5 +++-- .../wms/basicDataManage/documentSetting/switch/index.vue | 5 +++-- .../documentSetting/transactiontype/index.vue | 5 +++-- .../strategySetting/configurationsetting/index.vue | 5 +++-- .../basicDataManage/strategySetting/paramsetting/index.vue | 5 +++-- src/views/wms/basicDataManage/strategySetting/rule/index.vue | 5 +++-- .../basicDataManage/systemSetting/accountcalendar/index.vue | 5 +++-- .../basicDataManage/systemSetting/currencyexchange/index.vue | 5 +++-- .../basicDataManage/systemSetting/systemcalendar/index.vue | 5 +++-- 15 files changed, 46 insertions(+), 29 deletions(-) diff --git a/src/views/system/serialNumber/index.vue b/src/views/system/serialNumber/index.vue index 3dec54e48..2095c5d07 100644 --- a/src/views/system/serialNumber/index.vue +++ b/src/views/system/serialNumber/index.vue @@ -99,6 +99,9 @@ import download from '@/utils/download' import * as SerialNumberApi from '@/api/system/serialNumber' import SerialNumberForm from './SerialNumberForm.vue' +import { formatDate } from '@/utils/formatTime' + +const route = useRoute() //路由信息 defineOptions({ name: 'SerialNumber' }) @@ -168,7 +171,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SerialNumberApi.exportSerialNumber(queryParams) - download.excel(data, '流水号规则.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue index b5ddadaa5..6160bd6dd 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue @@ -78,6 +78,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +import { formatDate } from '@/utils/formatTime' // 业务类型 defineOptions({ name: 'Businesstype' }) @@ -365,7 +366,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await BusinesstypeApi.exportBusinesstype(tableObject.params) - download.excel(data, '业务类型.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -380,7 +381,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '业务类型导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue index 0d2e5e767..9c663adfc 100644 --- a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Documentsetting' }) @@ -213,7 +214,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await DocumentsettingApi.exportDocumentsetting(tableObject.params) - download.excel(data, '单据设置.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -228,7 +229,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '单据设置导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue index 9132137cb..b210a0d47 100644 --- a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Jobsetting' }) @@ -213,7 +214,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await JobsettingApi.exportJobsetting(tableObject.params) - download.excel(data, '任务单设置.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -228,7 +229,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '任务单设置导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue index 48405deac..2c24c8bc4 100644 --- a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Plansetting' }) @@ -214,7 +215,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PlansettingApi.exportPlansetting(tableObject.params) - download.excel(data, '计划单设置.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -229,7 +230,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '计划单设置导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue index ecce4f292..90c93f87f 100644 --- a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Recordsetting' }) @@ -214,7 +215,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await RecordsettingApi.exportRecordsetting(tableObject.params) - download.excel(data, '记录单设置.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -229,7 +230,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '记录单设置导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue index 34bb3745b..e5ea8a81b 100644 --- a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Requestsetting' }) @@ -214,7 +215,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await RequestsettingApi.exportRequestsetting(tableObject.params) - download.excel(data, '申请单设置.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -229,7 +230,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '申请单设置导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue index 66339989c..50cf76a72 100644 --- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Switch' }) @@ -189,7 +190,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SwitchApi.exportSwitch(tableObject.params) - download.excel(data, '单据开关.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -204,7 +205,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '单据开关导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue index cdd17db2f..877409fff 100644 --- a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Transactiontype' }) @@ -215,7 +216,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await TransactiontypeApi.exportTransactiontype(tableObject.params) - download.excel(data, '事务类型.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -230,7 +231,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '事务类型导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue index c4737a072..86836632c 100644 --- a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue @@ -75,6 +75,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Configurationsetting' }) @@ -210,7 +211,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ConfigurationsettingApi.exportConfigurationsetting(tableObject.params) - download.excel(data, '配置设置.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -225,7 +226,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '配置设置导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue index 7638fafb5..3b2c0b61d 100644 --- a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue @@ -66,6 +66,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Paramsetting' }) @@ -181,7 +182,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ParamsettingApi.exportParamsetting(tableObject.params) - download.excel(data, '参数设置.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -196,7 +197,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '参数设置导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/strategySetting/rule/index.vue b/src/views/wms/basicDataManage/strategySetting/rule/index.vue index e79792b66..5061b5315 100644 --- a/src/views/wms/basicDataManage/strategySetting/rule/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/rule/index.vue @@ -74,6 +74,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Rule' }) @@ -213,7 +214,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await RuleApi.exportRule(tableObject.params) - download.excel(data, '规则.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -228,7 +229,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '规则导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue index c1b7af032..ee11428cb 100644 --- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Accountcalendar' }) @@ -214,7 +215,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await AccountcalendarApi.exportAccountcalendar(tableObject.params) - download.excel(data, '账期日历.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -229,7 +230,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '账期日历导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue index 69e50046b..83203a9ad 100644 --- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue @@ -66,6 +66,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Currencyexchange' }) @@ -215,7 +216,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await CurrencyexchangeApi.exportCurrencyexchange(tableObject.params) - download.excel(data, '货币转换.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -230,7 +231,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '货币转换导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue index d9830e769..5d7a069da 100644 --- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Systemcalendar' }) @@ -214,7 +215,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SystemcalendarApi.exportSystemcalendar(tableObject.params) - download.excel(data, '系统日历.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -229,7 +230,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '系统日历导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { From c75b3b76b3277a19277886a893aba0ebb8a98301 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 12:33:18 +0800 Subject: [PATCH 05/30] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=92=8C=E6=8E=A5=E5=8D=95=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/index.vue | 90 ++++++++++++++++++--------- 1 file changed, 59 insertions(+), 31 deletions(-) diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index 3d430b68f..41860cf32 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -4,11 +4,13 @@ + excludeInspectionType: '1,4' + }) + " + /> @@ -23,7 +25,8 @@ - - + v-model="showQualityReport" + :title="t('质检明细')" + :append-to-body="false" + destroy-on-close + fullscreen + > + @@ -122,6 +126,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import AddForm from './addForm.vue' import Detail from './detail.vue' import { getReportUrl } from '@/utils/systemParam' +import { useUserStore } from '@/store/modules/user' // 采购订单 defineOptions({ name: 'inspectionJobMain' }) @@ -132,7 +137,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref(InspectionJobMain.allSchemas.tableColumns) - +const userStore = useUserStore() // 字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val @@ -202,7 +207,7 @@ const buttonBaseClick = (val, item) => { handleExport() } else if (val == 'refresh') { // 刷新 - if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + if (tableObject.params.filters && tableObject.params.filters.length > 0) { searchFormClick({ filters: tableObject.params.filters }) @@ -235,23 +240,35 @@ const isShowMainButton2 = (row, val) => { } } +// 根据状态返回该按钮是否显示 +const isShowMainButton1 = (row, val) => { + if (val.indexOf(row.status) > -1) { + if (userStore.getUser.id == row.acceptUserId) { + return false + } else { + return true + } + } else { + return true + } +} // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListJobAccBtn({ - hide: isShowMainButton(row, ['1']), - hasPermi: 'qms:inspection-job-main:accept' - }), // 承接 + // defaultButtons.mainListJobAccBtn({ + // hide: isShowMainButton(row, ['1']), + // hasPermi: 'qms:inspection-job-main:accept' + // }), // 承接 defaultButtons.mainListJobCloBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'qms:inspection-job-main:close' }), // 关闭 defaultButtons.mainListJobAbaBtn({ - hide: isShowMainButton(row, ['2']), + hide: isShowMainButton1(row, ['2']), hasPermi: 'qms:inspection-job-main:abandon' }), // 放弃 defaultButtons.mainListJobExeBtn({ - hide: isShowMainButton(row, ['2']), + hide: isShowMainButton(row, ['1', '2']), hasPermi: 'qms:inspection-job-main:execute' }), // 执行 defaultButtons.mainListOrderPubBtn({ @@ -299,8 +316,9 @@ const showQualityReport = ref(false) const qualityReport = ref('') const checkQualityReport = async (row) => { showQualityReport.value = true - qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}` + qualityReport.value =getReportUrl()+'purchasereceiptReport?asnNumber=' + row.asnNumber } + /** 添加/修改操作 */ // const formRef = ref() @@ -317,8 +335,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { //执行 const formRef = ref() -const execute = async (type: string, row?: number) => { - formRef.value.open(type, row) +const execute = async (type: string, row?: any) => { + if (row.status == '2') { + if (userStore.getUser.id == row.acceptUserId) { + formRef.value.open(type, row) + } else { + message.error('承接人与当前登录人不一致') + } + } else if (row.status == '1') { + await handleAccept(row.id) + formRef.value.open(type, row) + await getList() + } } /** 关闭按钮操作 */ const handleClose = async (id: number) => { @@ -329,7 +357,7 @@ const handleClose = async (id: number) => { await InspectionJobMainApi.closeInspectionJobMain(id) message.success(t('common.closeSuccess')) // 刷新列表 - buttonBaseClick('refresh',null) + buttonBaseClick('refresh', null) } catch {} } /** 发布按钮操作 */ @@ -341,19 +369,19 @@ const handleRelease = async (id: number) => { await InspectionJobMainApi.releaseInspectionJobMain(id) message.success('发布成功！') // 刷新列表 - buttonBaseClick('refresh',null) + buttonBaseClick('refresh', null) } catch {} } // 承接 const handleAccept = async (id: number) => { try { // 承接的二次确认 - await message.confirm(t('common.confirmAccept')) + // await message.confirm(t('common.confirmAccept')) // 发起承接 await InspectionJobMainApi.acceptInspectionJobMain(id) - message.success(t('common.acceptSuccess')) + // message.success(t('common.acceptSuccess')) // 刷新列表(TB反馈，取消承接后刷新页面) - buttonBaseClick('refresh',null) + // buttonBaseClick('refresh', null) } catch {} } // 放弃任务 @@ -365,7 +393,7 @@ const handleAbandon = async (id: number) => { await InspectionJobMainApi.abandonInspectionJobMain(id) message.success(t('common.giveupSuccess')) // 刷新列表 - buttonBaseClick('refresh',null) + buttonBaseClick('refresh', null) } catch {} } @@ -411,8 +439,8 @@ const submitForm = async (formType, data) => { // 刷新当前列表 if (formType === 'create') { getList() - }else{ - buttonBaseClick('refresh',null) + } else { + buttonBaseClick('refresh', null) } } finally { formRef.value.formLoading = false From 108ac6e0c6a08f981c81e6e3307e16523d9920bb Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 13:24:56 +0800 Subject: [PATCH 06/30] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=B8=89=E4=B8=AA=E9=A1=B5=E9=9D=A2=E5=90=88=E5=B9=B6=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=A3=80=E9=AA=8C=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 6 + src/views/qms/inspectionJob/index.vue | 2 +- src/views/qms/inspectionRecord/index.vue | 95 +- src/views/qms/inspectionRecordFirst/index.vue | 1 - .../inspectionRecordProduction/addForm.vue | 1571 ----------------- .../qms/inspectionRecordProduction/detail.vue | 402 ----- .../qms/inspectionRecordProduction/index.vue | 450 ----- .../inspectionRecordMain.data.ts | 964 ---------- .../inspectionRecordProduction/useAddForm.vue | 312 ---- .../qms/inspectionRecordPurchase/addForm.vue | 1571 ----------------- .../qms/inspectionRecordPurchase/detail.vue | 402 ----- .../qms/inspectionRecordPurchase/index.vue | 450 ----- .../inspectionRecordMain.data.ts | 964 ---------- .../inspectionRecordPurchase/useAddForm.vue | 312 ---- 14 files changed, 81 insertions(+), 7421 deletions(-) delete mode 100644 src/views/qms/inspectionRecordProduction/addForm.vue delete mode 100644 src/views/qms/inspectionRecordProduction/detail.vue delete mode 100644 src/views/qms/inspectionRecordProduction/index.vue delete mode 100644 src/views/qms/inspectionRecordProduction/inspectionRecordMain.data.ts delete mode 100644 src/views/qms/inspectionRecordProduction/useAddForm.vue delete mode 100644 src/views/qms/inspectionRecordPurchase/addForm.vue delete mode 100644 src/views/qms/inspectionRecordPurchase/detail.vue delete mode 100644 src/views/qms/inspectionRecordPurchase/index.vue delete mode 100644 src/views/qms/inspectionRecordPurchase/inspectionRecordMain.data.ts delete mode 100644 src/views/qms/inspectionRecordPurchase/useAddForm.vue diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 9d92b889c..7fcdee9ed 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -6,6 +6,7 @@ :width="dialogWidth" :close-on-click-modal="false" :vLoading="formLoading" + :before-close="handleClose" >
{ } } } +const handleClose =async (done: () => void) => { + await InspectionJobMainApi.abandonInspectionJobMain(data.value.id) + emit('close') + done() +} - diff --git a/src/views/qms/inspectionRecordProduction/detail.vue b/src/views/qms/inspectionRecordProduction/detail.vue deleted file mode 100644 index 4b27eddbf..000000000 --- a/src/views/qms/inspectionRecordProduction/detail.vue +++ /dev/null @@ -1,402 +0,0 @@ - - - - - diff --git a/src/views/qms/inspectionRecordProduction/index.vue b/src/views/qms/inspectionRecordProduction/index.vue deleted file mode 100644 index 59c7e9b79..000000000 --- a/src/views/qms/inspectionRecordProduction/index.vue +++ /dev/null @@ -1,450 +0,0 @@ - - - diff --git a/src/views/qms/inspectionRecordProduction/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecordProduction/inspectionRecordMain.data.ts deleted file mode 100644 index 9c106671b..000000000 --- a/src/views/qms/inspectionRecordProduction/inspectionRecordMain.data.ts +++ /dev/null @@ -1,964 +0,0 @@ -import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter2 } from '@/utils/formatTime' -import { validateHanset, validateEmail } from '@/utils/validator' -import { dateFormatter } from '@/utils/formatTime' -import { validateTwoNum, validateSixNum } from '@/utils/validator' -const { t } = useI18n() // 国际化 - -/** - * @returns {Array} 检验任务主表 - */ -export const InspectionRecordMain = useCrudSchemas( - reactive([ - { - label: '记录编码', - field: 'number', - sort: 'custom', - isSearch: true, - table: { - width: 200, - fixed: 'left' - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '申请编码', - field: 'requestNumber', - sort: 'custom', - isSearch: true, - table: { - width: 200 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '任务编码', - field: 'jobNumber', - sort: 'custom', - isSearch: false, - table: { - width: 200 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '发货单号', - field: 'asnNumber', - sort: 'custom', - isSearch: true, - isForm: false, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 180 - } - }, - { - label: '供应商编码', - field: 'supplierCode', - sort: 'custom', - isSearch: false, - table: { - width: 200 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '供应商名称', - field: 'supplierName', - sort: 'custom', - isSearch: false, - table: { - width: 200 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物料编码', - field: 'itemCode', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物料名称', - field: 'itemName', - sort: 'custom', - isSearch: false, - table: { - width: 200 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '批次', - field: 'batch', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '供应商批次', - field: 'supplierBatch', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '检验方案编码', - field: 'inspectionSchemeCode', - sort: 'custom', - isSearch: false, - table: { - width: 200 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '检验批次', - field: 'inspectionBatch', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '检验批数量', - field: 'inspectionBatchAmount', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - // { - // label: '采样总数量', - // field: 'sampleTotalAmount', - // sort: 'custom', - // isSearch: false, - // isForm:false, - // table: { - // width: 150 - // } - // }, - { - label: '检验类型', - field: 'inspectionType', - dictType: DICT_TYPE.INSPECTION_TYPE, - sort: 'custom', - isSearch: false, - form: { - component: 'Select', - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '参考订单号', - field: 'referenceOrderCode', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '参考订单行', - field: 'referenceOrderRow', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '参考凭证号', - field: 'referenceCertificateCode', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - // reference_certificate_row - label: '参考凭证行', - field: 'referenceCertificateRow', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '检验阶段', - field: 'inspectionStage', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '检验严格性', - field: 'inspectionStringency', - dictType: DICT_TYPE.INSPECTION_SEVERITY, - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '计划开始时间', - field: 'planStartTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x', - disabled: true - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - { - label: '计划结束时间', - field: 'planEndTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x', - disabled: true - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - { - label: '实际开始时间', - field: 'realStartTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x', - disabled: true - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - { - label: '实际结束时间', - field: 'realEndTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x', - disabled: true - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - - { - label: '收货时间', - field: 'deliveryTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - { - label: '检验水平', - field: 'inspectionLevel', - dictType: DICT_TYPE.INSPECTION_LEVEL, - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: 'AQL值', - field: 'aqlValue', - dictType: DICT_TYPE.BASIC_AQL, - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '使用决策', - field: 'useDecision', - sort: 'custom', - isSearch: false, - dictType: DICT_TYPE.USAGE_DECISION, - table: { - width: 150 - }, - isForm: false - }, - { - label: '执行结果', - field: 'estimateCode', - dictType: DICT_TYPE.EVALUATION_CODE, - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '包装号', - field: 'packageCode', - sort: 'custom', - isSearch: true, - isTable: false, - isForm: false, - tableForm: { - disabled: false - } - }, - { - label: '创建时间', - field: 'createTime', - isForm: false, - table: { - width: 180 - }, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - }, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - } - }, - { - label: '创建者', - field: 'creator', - table: { - width: 130 - }, - isForm: false, - isTable: true - }, - { - label: '最后更新时间', - field: 'updateTime', - sort: 'custom', - isDetail: true, - isForm: false, - isTable: false, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - { - label: '最后更新者', - field: 'updater', - isDetail: true, - isForm: false, - isTable: false, - table: { - width: 150 - } - }, - { - label: '操作', - field: 'action', - isForm: false, - isDetail: false, - table: { - width: 300, - fixed: 'right' - } - } - ]) -) - -//表单校验 -export const InspectionRecordMainRules = reactive({ - useDecision: [required], - -}) - -/** - * @returns {Array} 检验任务子表 - */ -export const InspectionRecordDetail = useCrudSchemas(reactive([ - { - label: 'id', - field: 'id', - sort: 'custom', - isTable: false, - isSearch: false, - isForm: false, - }, - { - label: '记录编码', - field: 'recordCode', - sort: 'custom', - isSearch: false, - }, - { - label: '工序编码', - field: 'processCode', - sort: 'custom', - isSearch: false, - }, - { - label: '工序描述', - field: 'processDescribe', - sort: 'custom', - isSearch: false, - }, - { - label: '顺序号', - field: 'sequenceCode', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0 - }, - }, - { - label: '是否破坏性检验', - field: 'isDestroyInspection', - sort: 'custom', - isSearch: false, - form: { - component: 'Radio' - }, - }, - { - label: '检验开始时间', - field: 'inspectionStartTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - }, - { - label: '检验结束时间', - field: 'inspectionEndTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - }, - { - label: '检验人', - field: 'inspectionOperator', - sort: 'custom', - isSearch: false, - }, - { - label: '检验特性编码', - field: 'inspectionFeaturesCode', - sort: 'custom', - isSearch: false, - }, - // { - // label: '是否可用', - // field: 'available', - // sort: 'custom', - // isSearch: false, - // }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - isForm: false, - }, - - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false, - table: { - width: 150, - fixed: 'right' - }, - isTableForm: false, - } -])) - -//表单校验 -export const InspectionRecordDetailRules = reactive({ - recordCode: [required], - processCode: [required], - sequenceCode: [required], - isDestroyInspection: [required], - available: [required], -}) - -/** - * @returns {Array} 检验记录包装 - */ -export const InspectionRecordPackage = useCrudSchemas(reactive([ - { - label: '编码', - field: 'number', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 200 - }, - table: { - width: 150 - } - }, - { - label: '包装号', - field: 'packageCode', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 160 - }, - table: { - width: 150 - } - }, - { - label: '包装规格', - field: 'packageSpecificationCode', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 150 - }, - table: { - width: 150 - } - }, - { - label: '数量', - field: 'amount', - sort: 'custom', - isSearch: true, - form: { - component: 'InputNumber', - value: 0 - }, - tableForm: { - disabled: true, - width: 120 - }, - table: { - width: 150 - } - }, - { - label: '计量单位', - field: 'measuringUnit', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 120 - }, - table: { - width: 150 - } - }, - { - label: '采样数量', - field: 'sampleAmount', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 100 - }, - table: { - width: 150 - } - }, - { - label: '合格数量', - field: 'qualifiedAmount', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 100 - }, - table: { - width: 150 - } - }, - { - label: '不合格数量', - field: 'noQualifiedAmount', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 100 - }, - table: { - width: 150 - } - }, - { - label: '破坏数量', - field: 'destroyAmount', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 100 - }, - table: { - width: 150 - } - }, - { - label: '冻结数量', - field: 'frozenAmount', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 100 - }, - table: { - width: 150 - } - } -])) - -//表单校验 -export const InspectionRecordPackageRules = reactive({ - qualifiedAmount: [ - required, - { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' } - ], - frozenAmount: [ - required, - { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' } - ], - destroyAmount: [ - required, - { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' } - ], - noQualifiedAmount: [ - required, - { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' } - ], -}) - - -//表单校验 -export const InspectionRecordUserRules = reactive({ - useDecision: [required], - -}) - -/** - * @returns {Array} 检验任务子表 - */ -export const InspectionRecordUser = useCrudSchemas(reactive([ - { - label: '发货单号', - field: 'asnNumber', - sort: 'custom', - isSearch: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 180 - } - }, - { - label: '使用决策', - field: 'useDecision', - sort: 'custom', - isSearch: false, - dictType: DICT_TYPE.USAGE_DECISION, - table: { - width: 150 - } - }, -])) diff --git a/src/views/qms/inspectionRecordProduction/useAddForm.vue b/src/views/qms/inspectionRecordProduction/useAddForm.vue deleted file mode 100644 index c430495c8..000000000 --- a/src/views/qms/inspectionRecordProduction/useAddForm.vue +++ /dev/null @@ -1,312 +0,0 @@ - - - - - diff --git a/src/views/qms/inspectionRecordPurchase/addForm.vue b/src/views/qms/inspectionRecordPurchase/addForm.vue deleted file mode 100644 index 037c9456b..000000000 --- a/src/views/qms/inspectionRecordPurchase/addForm.vue +++ /dev/null @@ -1,1571 +0,0 @@ - - - - diff --git a/src/views/qms/inspectionRecordPurchase/detail.vue b/src/views/qms/inspectionRecordPurchase/detail.vue deleted file mode 100644 index 4b27eddbf..000000000 --- a/src/views/qms/inspectionRecordPurchase/detail.vue +++ /dev/null @@ -1,402 +0,0 @@ - - - - - diff --git a/src/views/qms/inspectionRecordPurchase/index.vue b/src/views/qms/inspectionRecordPurchase/index.vue deleted file mode 100644 index 652820c96..000000000 --- a/src/views/qms/inspectionRecordPurchase/index.vue +++ /dev/null @@ -1,450 +0,0 @@ - - - diff --git a/src/views/qms/inspectionRecordPurchase/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecordPurchase/inspectionRecordMain.data.ts deleted file mode 100644 index 9c106671b..000000000 --- a/src/views/qms/inspectionRecordPurchase/inspectionRecordMain.data.ts +++ /dev/null @@ -1,964 +0,0 @@ -import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter2 } from '@/utils/formatTime' -import { validateHanset, validateEmail } from '@/utils/validator' -import { dateFormatter } from '@/utils/formatTime' -import { validateTwoNum, validateSixNum } from '@/utils/validator' -const { t } = useI18n() // 国际化 - -/** - * @returns {Array} 检验任务主表 - */ -export const InspectionRecordMain = useCrudSchemas( - reactive([ - { - label: '记录编码', - field: 'number', - sort: 'custom', - isSearch: true, - table: { - width: 200, - fixed: 'left' - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '申请编码', - field: 'requestNumber', - sort: 'custom', - isSearch: true, - table: { - width: 200 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '任务编码', - field: 'jobNumber', - sort: 'custom', - isSearch: false, - table: { - width: 200 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '发货单号', - field: 'asnNumber', - sort: 'custom', - isSearch: true, - isForm: false, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 180 - } - }, - { - label: '供应商编码', - field: 'supplierCode', - sort: 'custom', - isSearch: false, - table: { - width: 200 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '供应商名称', - field: 'supplierName', - sort: 'custom', - isSearch: false, - table: { - width: 200 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物料编码', - field: 'itemCode', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物料名称', - field: 'itemName', - sort: 'custom', - isSearch: false, - table: { - width: 200 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '批次', - field: 'batch', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '供应商批次', - field: 'supplierBatch', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '检验方案编码', - field: 'inspectionSchemeCode', - sort: 'custom', - isSearch: false, - table: { - width: 200 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '检验批次', - field: 'inspectionBatch', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '检验批数量', - field: 'inspectionBatchAmount', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - // { - // label: '采样总数量', - // field: 'sampleTotalAmount', - // sort: 'custom', - // isSearch: false, - // isForm:false, - // table: { - // width: 150 - // } - // }, - { - label: '检验类型', - field: 'inspectionType', - dictType: DICT_TYPE.INSPECTION_TYPE, - sort: 'custom', - isSearch: false, - form: { - component: 'Select', - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '参考订单号', - field: 'referenceOrderCode', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '参考订单行', - field: 'referenceOrderRow', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '参考凭证号', - field: 'referenceCertificateCode', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - // reference_certificate_row - label: '参考凭证行', - field: 'referenceCertificateRow', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '检验阶段', - field: 'inspectionStage', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '检验严格性', - field: 'inspectionStringency', - dictType: DICT_TYPE.INSPECTION_SEVERITY, - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '计划开始时间', - field: 'planStartTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x', - disabled: true - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - { - label: '计划结束时间', - field: 'planEndTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x', - disabled: true - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - { - label: '实际开始时间', - field: 'realStartTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x', - disabled: true - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - { - label: '实际结束时间', - field: 'realEndTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x', - disabled: true - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - - { - label: '收货时间', - field: 'deliveryTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - { - label: '检验水平', - field: 'inspectionLevel', - dictType: DICT_TYPE.INSPECTION_LEVEL, - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: 'AQL值', - field: 'aqlValue', - dictType: DICT_TYPE.BASIC_AQL, - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '使用决策', - field: 'useDecision', - sort: 'custom', - isSearch: false, - dictType: DICT_TYPE.USAGE_DECISION, - table: { - width: 150 - }, - isForm: false - }, - { - label: '执行结果', - field: 'estimateCode', - dictType: DICT_TYPE.EVALUATION_CODE, - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '包装号', - field: 'packageCode', - sort: 'custom', - isSearch: true, - isTable: false, - isForm: false, - tableForm: { - disabled: false - } - }, - { - label: '创建时间', - field: 'createTime', - isForm: false, - table: { - width: 180 - }, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - }, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - } - }, - { - label: '创建者', - field: 'creator', - table: { - width: 130 - }, - isForm: false, - isTable: true - }, - { - label: '最后更新时间', - field: 'updateTime', - sort: 'custom', - isDetail: true, - isForm: false, - isTable: false, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - { - label: '最后更新者', - field: 'updater', - isDetail: true, - isForm: false, - isTable: false, - table: { - width: 150 - } - }, - { - label: '操作', - field: 'action', - isForm: false, - isDetail: false, - table: { - width: 300, - fixed: 'right' - } - } - ]) -) - -//表单校验 -export const InspectionRecordMainRules = reactive({ - useDecision: [required], - -}) - -/** - * @returns {Array} 检验任务子表 - */ -export const InspectionRecordDetail = useCrudSchemas(reactive([ - { - label: 'id', - field: 'id', - sort: 'custom', - isTable: false, - isSearch: false, - isForm: false, - }, - { - label: '记录编码', - field: 'recordCode', - sort: 'custom', - isSearch: false, - }, - { - label: '工序编码', - field: 'processCode', - sort: 'custom', - isSearch: false, - }, - { - label: '工序描述', - field: 'processDescribe', - sort: 'custom', - isSearch: false, - }, - { - label: '顺序号', - field: 'sequenceCode', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0 - }, - }, - { - label: '是否破坏性检验', - field: 'isDestroyInspection', - sort: 'custom', - isSearch: false, - form: { - component: 'Radio' - }, - }, - { - label: '检验开始时间', - field: 'inspectionStartTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - }, - { - label: '检验结束时间', - field: 'inspectionEndTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - }, - { - label: '检验人', - field: 'inspectionOperator', - sort: 'custom', - isSearch: false, - }, - { - label: '检验特性编码', - field: 'inspectionFeaturesCode', - sort: 'custom', - isSearch: false, - }, - // { - // label: '是否可用', - // field: 'available', - // sort: 'custom', - // isSearch: false, - // }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - isForm: false, - }, - - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false, - table: { - width: 150, - fixed: 'right' - }, - isTableForm: false, - } -])) - -//表单校验 -export const InspectionRecordDetailRules = reactive({ - recordCode: [required], - processCode: [required], - sequenceCode: [required], - isDestroyInspection: [required], - available: [required], -}) - -/** - * @returns {Array} 检验记录包装 - */ -export const InspectionRecordPackage = useCrudSchemas(reactive([ - { - label: '编码', - field: 'number', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 200 - }, - table: { - width: 150 - } - }, - { - label: '包装号', - field: 'packageCode', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 160 - }, - table: { - width: 150 - } - }, - { - label: '包装规格', - field: 'packageSpecificationCode', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 150 - }, - table: { - width: 150 - } - }, - { - label: '数量', - field: 'amount', - sort: 'custom', - isSearch: true, - form: { - component: 'InputNumber', - value: 0 - }, - tableForm: { - disabled: true, - width: 120 - }, - table: { - width: 150 - } - }, - { - label: '计量单位', - field: 'measuringUnit', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 120 - }, - table: { - width: 150 - } - }, - { - label: '采样数量', - field: 'sampleAmount', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 100 - }, - table: { - width: 150 - } - }, - { - label: '合格数量', - field: 'qualifiedAmount', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 100 - }, - table: { - width: 150 - } - }, - { - label: '不合格数量', - field: 'noQualifiedAmount', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 100 - }, - table: { - width: 150 - } - }, - { - label: '破坏数量', - field: 'destroyAmount', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 100 - }, - table: { - width: 150 - } - }, - { - label: '冻结数量', - field: 'frozenAmount', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true, - width: 100 - }, - table: { - width: 150 - } - } -])) - -//表单校验 -export const InspectionRecordPackageRules = reactive({ - qualifiedAmount: [ - required, - { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' } - ], - frozenAmount: [ - required, - { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' } - ], - destroyAmount: [ - required, - { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' } - ], - noQualifiedAmount: [ - required, - { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' } - ], -}) - - -//表单校验 -export const InspectionRecordUserRules = reactive({ - useDecision: [required], - -}) - -/** - * @returns {Array} 检验任务子表 - */ -export const InspectionRecordUser = useCrudSchemas(reactive([ - { - label: '发货单号', - field: 'asnNumber', - sort: 'custom', - isSearch: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 180 - } - }, - { - label: '使用决策', - field: 'useDecision', - sort: 'custom', - isSearch: false, - dictType: DICT_TYPE.USAGE_DECISION, - table: { - width: 150 - } - }, -])) diff --git a/src/views/qms/inspectionRecordPurchase/useAddForm.vue b/src/views/qms/inspectionRecordPurchase/useAddForm.vue deleted file mode 100644 index c430495c8..000000000 --- a/src/views/qms/inspectionRecordPurchase/useAddForm.vue +++ /dev/null @@ -1,312 +0,0 @@ - - - - - From a655a026dbe24fc6e7704737a40b024d5315952a Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 14:01:00 +0800 Subject: [PATCH 07/30] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=92=8C=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E7=AE=A1=E7=90=86=E7=9A=84=E5=AF=BC=E5=87=BA=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/basicDataManage/labelManage/barcode/index.vue | 5 +++-- .../basicDataManage/labelManage/callmaterials/index.vue | 5 +++-- .../basicDataManage/labelManage/locationLabel/index.vue | 3 ++- .../labelManage/manufacturePackage/index.vue | 7 +++++-- .../basicDataManage/labelManage/purchasePackage/index.vue | 5 +++-- .../basicDataManage/labelManage/utensilPackage/index.vue | 5 +++-- .../wms/basicDataManage/orderManage/carrier/index.vue | 5 +++-- src/views/wms/basicDataManage/orderManage/owner/index.vue | 5 +++-- src/views/wms/basicDataManage/orderManage/team/index.vue | 5 +++-- 9 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/barcode/index.vue b/src/views/wms/basicDataManage/labelManage/barcode/index.vue index 91ea8cbab..62e73fd39 100644 --- a/src/views/wms/basicDataManage/labelManage/barcode/index.vue +++ b/src/views/wms/basicDataManage/labelManage/barcode/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Barcode' }) @@ -218,7 +219,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await BarcodeApi.exportBarcode(tableObject.params) - download.excel(data, '条码片段.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -234,7 +235,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '条码片段导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index 0350c674a..602801310 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -79,6 +79,7 @@ import * as PackageApi from '@/api/wms/package' import * as ItembasicApi from '@/api/wms/itembasic' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 叫料标签 defineOptions({ name: 'Callmaterials' }) @@ -290,7 +291,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await CallmaterialsApi.exportCallmaterials(tableObject.params) - download.excel(data, '叫料标签.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -338,7 +339,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '叫料标签导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue index b39ba8e44..50c977fc7 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue @@ -54,6 +54,7 @@ import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import * as Itempackaging from '@/api/wms/itempackaging' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 库位标签 defineOptions({ name: 'LocationLabel' }) @@ -177,7 +178,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await BarbasicApi.exportBarbasic(tableObject.params) - download.excel(data, '库位标签.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index 6aa6e2db1..bda0f5106 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -67,6 +67,7 @@ import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import * as Itempackaging from '@/api/wms/itempackage' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 采购标签 defineOptions({ name: 'PurchasePackage' }) @@ -154,6 +155,7 @@ const buttonBaseClick = (val, item) => { } else if (val == 'import') { // 导入 handleImport() } else if (val == 'export') { // 导出 + debugger handleExport() } else if (val == 'refresh') { // 刷新 if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { @@ -241,12 +243,13 @@ const handleDelete = async (id: number) => { const exportLoading = ref(false) // 导出的加载中 const handleExport = async () => { try { + debugger // 导出的二次确认 await message.exportConfirm() // 发起导出 exportLoading.value = true const data = await BarbasicApi.exportBarbasic(tableObject.params) - download.excel(data, '制造件件标签.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -318,7 +321,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '包装导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index c13cfd8d5..a755d2bea 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -68,6 +68,7 @@ import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import * as Itempackaging from '@/api/wms/itempackage' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 采购标签 defineOptions({ name: 'PurchasePackage' }) @@ -247,7 +248,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await BarbasicApi.exportBarbasic(tableObject.params) - download.excel(data, '采购件标签.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -314,7 +315,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '包装导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue index bf41d8eac..68424897e 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue @@ -64,6 +64,7 @@ import { getAccessToken } from '@/utils/auth' import { Package,PackageRules } from './utensilPackage.data' import * as BarbasicApi from '@/api/wms/barbasic' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 器具标签 defineOptions({ name: 'UtensilPackage' }) @@ -229,7 +230,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await BarbasicApi.exportBarbasic(tableObject.params) - download.excel(data, '器具标签.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -252,7 +253,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '包装导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/basicDataManage/orderManage/carrier/index.vue b/src/views/wms/basicDataManage/orderManage/carrier/index.vue index 6e087650c..84931c430 100644 --- a/src/views/wms/basicDataManage/orderManage/carrier/index.vue +++ b/src/views/wms/basicDataManage/orderManage/carrier/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Carrier' }) @@ -233,7 +234,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await CarrierApi.exportCarrier(tableObject.params) - download.excel(data, '承运商.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -248,7 +249,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '承运商导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/orderManage/owner/index.vue b/src/views/wms/basicDataManage/orderManage/owner/index.vue index 8c999e712..d217f2ac4 100644 --- a/src/views/wms/basicDataManage/orderManage/owner/index.vue +++ b/src/views/wms/basicDataManage/orderManage/owner/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Owner' }) @@ -234,7 +235,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await OwnerApi.exportOwner(tableObject.params) - download.excel(data, '货主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -249,7 +250,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '货主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/orderManage/team/index.vue b/src/views/wms/basicDataManage/orderManage/team/index.vue index 36770fa22..c6892a584 100644 --- a/src/views/wms/basicDataManage/orderManage/team/index.vue +++ b/src/views/wms/basicDataManage/orderManage/team/index.vue @@ -68,6 +68,7 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' import TeamForm from "@/views/wms/basicDataManage/orderManage/team/teamForm.vue"; import {sync} from "rimraf"; +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Team' }) @@ -228,7 +229,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await TeamApi.exportTeam(tableObject.params) - download.excel(data, '班组.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -243,7 +244,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '班组导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { From 48fe56199251a8de9f4ceb5269ccaaa50bcd6ce5 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 14:10:49 +0800 Subject: [PATCH 08/30] =?UTF-8?q?AGV=E7=AE=A1=E7=90=86=EF=BC=8CMes?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=EF=BC=8C=E7=A7=91=E7=9B=AE=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D=E5=AD=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/agvManage/agvLocationrelation/index.vue | 5 +++-- src/views/wms/basicDataManage/subject/mstr/index.vue | 5 +++-- .../wms/basicDataManage/subject/qadCostcentre/index.vue | 5 +++-- src/views/wms/basicDataManage/subject/qadProject/index.vue | 5 +++-- .../wms/basicDataManage/subject/subjectAccount/index.vue | 5 +++-- src/views/wms/buttMesManage/mesBarCode/index.vue | 5 +++-- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/views/wms/agvManage/agvLocationrelation/index.vue b/src/views/wms/agvManage/agvLocationrelation/index.vue index 0119205df..11bc4ff83 100644 --- a/src/views/wms/agvManage/agvLocationrelation/index.vue +++ b/src/views/wms/agvManage/agvLocationrelation/index.vue @@ -69,6 +69,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'AgvLocationrelation' }) @@ -243,7 +244,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await AgvLocationrelationApi.exportAgvLocationrelation(tableObject.params) - download.excel(data, 'AGV库位转换.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -258,7 +259,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: 'AGV库位转换导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue index 56634a966..3ee5a05ec 100644 --- a/src/views/wms/basicDataManage/subject/mstr/index.vue +++ b/src/views/wms/basicDataManage/subject/mstr/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'Mstr' }) @@ -212,7 +213,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await MstrApi.exportMstr(tableObject.params) - download.excel(data, '产品类信息.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -227,7 +228,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '产品类信息导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue index 87b6a5273..a50649fbb 100644 --- a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue +++ b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'QadCostcentre' }) @@ -221,7 +222,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await QadCostcentreApi.exportQadCostcentre(tableObject.params) - download.excel(data, 'QAD成品中心.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -236,7 +237,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: 'QAD成品中心导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/subject/qadProject/index.vue b/src/views/wms/basicDataManage/subject/qadProject/index.vue index 0658d4d47..b5d878efb 100644 --- a/src/views/wms/basicDataManage/subject/qadProject/index.vue +++ b/src/views/wms/basicDataManage/subject/qadProject/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'QadProject' }) @@ -221,7 +222,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await QadProjectApi.exportQadProject(tableObject.params) - download.excel(data, 'QAD项目信息.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -236,7 +237,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: 'QAD项目信息导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue index cb5cc5ac0..db7621df2 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue +++ b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'SubjectAccount' }) @@ -230,7 +231,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SubjectAccountApi.exportSubjectAccount(tableObject.params) - download.excel(data, '科目账户配置.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -245,7 +246,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '科目账户配置导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/buttMesManage/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue index 7d4cda97d..a0ac95b07 100644 --- a/src/views/wms/buttMesManage/mesBarCode/index.vue +++ b/src/views/wms/buttMesManage/mesBarCode/index.vue @@ -73,6 +73,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' import { getTenantId }from '@/utils/auth' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'MesBarCode' }) @@ -223,7 +224,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await MesBarCodeApi.exportMesBarCode(tableObject.params) - download.excel(data, '生产条码清单.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -238,7 +239,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '生产条码清单导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { From 9fe8df04fdf2d5ea9d4c078be4569c83f8d79005 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 13 Aug 2024 14:17:37 +0800 Subject: [PATCH 09/30] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/productionreturnRecordDetail/index.ts | 20 +++++++++++++++++++ .../productionreturnRecordMain/index.vue | 5 +++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/api/wms/productionreturnRecordDetail/index.ts b/src/api/wms/productionreturnRecordDetail/index.ts index f9ffcd4a4..910cb941e 100644 --- a/src/api/wms/productionreturnRecordDetail/index.ts +++ b/src/api/wms/productionreturnRecordDetail/index.ts @@ -44,6 +44,26 @@ export const getProductionreturnRecordDetailPage = async (params) => { return await request.get({ url: `/wms/productionreturn-record-detail/page`, params }) } } +// 查询生产退料记录子列表 +export const getProductionreturnRecordDetailPageStore = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/productionreturn-record-detail-store/senior', data }) + } else { + return await request.get({ url: `/wms/productionreturn-record-detail-store/page`, params }) + } +} +// 查询隔离退料记录子列表 +export const getProductionreturnRecordDetailPageHold = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/productionreturn-record-detail-hold/senior', data }) + } else { + return await request.get({ url: `/wms/productionreturn-record-detail-hold/page`, params }) + } +} // 查询生产退料记录子详情 export const getProductionreturnRecordDetail = async (id: number) => { diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue index ae8aebbeb..f367ebfdf 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue @@ -68,7 +68,7 @@ import * as ProductionreturnRecordMainApi from '@/api/wms/productionreturnRecord import * as ProductionreturnRecordDetailApi from '@/api/wms/productionreturnRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' -// 生产退料记录主 +// 生产退料记录主 and 隔离退料记录 defineOptions({ name: 'ProductionreturnRecordMain' }) const message = useMessage() // 消息弹窗 @@ -77,6 +77,7 @@ const { t } = useI18n() // 国际化 const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name + const tableColumns = ref([...ProductionreturnRecordMain.allSchemas.tableColumns,...ProductionreturnRecordDetail.allSchemas.tableMainColumns]) // 字段设置 更新主列表字段 @@ -85,7 +86,7 @@ const updataTableColumns = (val) => { } const { tableObject, tableMethods } = useTable({ - getListApi: ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPage // 分页接口 + getListApi: 'ProductionreturnRecordMain'==routeName.value?ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPageStore:ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPageHold // 分页接口 }) // 获得表格的各种操作 From 2099474d9f52c008cf9b73d310409d49f87e4052 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 13 Aug 2024 14:30:41 +0800 Subject: [PATCH 10/30] =?UTF-8?q?=E6=9D=A8=E7=8E=89=E7=A6=8F=E6=8F=90?= =?UTF-8?q?=EF=BC=9A=20=E5=AE=9E=E9=99=85=E7=94=B3=E8=AF=B7=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E6=95=B0=E9=87=8F=E4=B8=BA0.954=EF=BC=8C=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E5=90=8E=E7=82=B9=E5=87=BB=E4=BF=9D=E5=AD=98=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=8F=98=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index dc00704d6..ee1d15355 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -687,13 +687,13 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive { const validateQty = (rule: any, value: any, callback: any,a,b) => { console.log('validateQty',rule, value,a,b) - // if (!reg.test(value)) { - // callback(new Error('英文字母、数字或下划线')); - // } else { + if (!value) { + callback(new Error('发货数量必须大于0')); + } else { callback(); - // } + } } //表单校验 export const SupplierdeliverRequestDetailRules = reactive({ @@ -1267,8 +1267,8 @@ export const SupplierdeliverRequestDetailRules = reactive({ // { required: true, message: '请输入包装号', trigger: 'blur' } // ], qty:[ - { required: true, message: '请输入发货数量1', trigger: 'change' }, - // { validator: validateQty, trigger: 'change' }, + { required: true, message: '请输入发货数量', trigger: 'change' }, + { validator: validateQty, trigger: 'change' }, ], supplierBatch: [ { required: true, message: '请输入供应商批次', trigger: 'blur' } From bb2d9126011b17f83e89f16b49bb46f4dfff7fec Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 13 Aug 2024 14:44:12 +0800 Subject: [PATCH 11/30] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=81=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerManage/customer/customer.data.ts | 4 ++-- .../customerManage/customerdock/customerdock.data.ts | 4 ++-- .../customerManage/customeritem/customeritem.data.ts | 4 ++-- .../customerManage/project/project.data.ts | 4 ++-- .../customerManage/saleprice/saleprice.data.ts | 4 ++-- .../purchaseprice/purchaseprice.data.ts | 4 ++-- .../supplierManage/supplier/supplier.data.ts | 12 +++++++++--- .../supplierManage/supplieritem/supplieritem.data.ts | 12 +++++++++--- 8 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts index e99169502..7f0add9a9 100644 --- a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts @@ -244,7 +244,7 @@ export const Customer = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -267,7 +267,7 @@ export const Customer = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts index 4ece20cf8..55f5941d9 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts @@ -296,7 +296,7 @@ export const Customerdock = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -319,7 +319,7 @@ export const Customerdock = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts index 396528e7b..5372ea34b 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts @@ -284,7 +284,7 @@ export const Customeritem = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -307,7 +307,7 @@ export const Customeritem = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/customerManage/project/project.data.ts b/src/views/wms/basicDataManage/customerManage/project/project.data.ts index 70b4ca87c..d54cd7751 100644 --- a/src/views/wms/basicDataManage/customerManage/project/project.data.ts +++ b/src/views/wms/basicDataManage/customerManage/project/project.data.ts @@ -163,7 +163,7 @@ export const Project = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -186,7 +186,7 @@ export const Project = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts index f298961eb..6b01575b9 100644 --- a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts +++ b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts @@ -222,7 +222,7 @@ export const Saleprice = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -245,7 +245,7 @@ export const Saleprice = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts index 399553c0a..ad342343c 100644 --- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts @@ -214,7 +214,7 @@ export const Purchaseprice = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -237,7 +237,7 @@ export const Purchaseprice = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts index 2508b2d78..b386fcf1a 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts @@ -227,6 +227,9 @@ export const Supplier = useCrudSchemas(reactive([ detail: { dateFormat : 'YYYY-MM-DD HH:mm:ss' }, + table: { + width: 180 + }, form: { component: 'DatePicker', componentProps: { @@ -241,7 +244,10 @@ export const Supplier = useCrudSchemas(reactive([ label: '创建者', field: 'creator', isForm: false, - isTable: true + isTable: true, + table: { + width: 150 + }, }, { label: '最后更新时间', @@ -249,7 +255,7 @@ export const Supplier = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -272,7 +278,7 @@ export const Supplier = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts index 5ddace825..200a5484d 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts @@ -302,6 +302,9 @@ export const Supplieritem = useCrudSchemas(reactive([ detail: { dateFormat : 'YYYY-MM-DD HH:mm:ss' }, + table: { + width: 180 + }, form: { component: 'DatePicker', componentProps: { @@ -316,7 +319,10 @@ export const Supplieritem = useCrudSchemas(reactive([ label: '创建者', field: 'creator', isForm: false, - isTable: true + isTable: true, + table: { + width: 150 + }, }, { label: '最后更新时间', @@ -324,7 +330,7 @@ export const Supplieritem = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -347,7 +353,7 @@ export const Supplieritem = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } From b9c8130f777b5223571515be4ec42c1badc6c9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Tue, 13 Aug 2024 14:57:41 +0800 Subject: [PATCH 12/30] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=A7=AF=E6=9C=A8=E6=8A=A5=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRecordMain/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index 4619a99d0..e3e3e3a18 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -140,15 +140,15 @@ const butttondata = (row,$index) => { const buttonTableClick = async (val, row) => { if (val == 'documentPrint') { // 单据打印 - handleDocumentPrint(row.masterId) + handleDocumentPrint(row.id,row.masterId) } } // 单据打印 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 (id,masterId) => { + window.open(documentSrc.value + '&id=' + id+ '&masterId=' + masterId) } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() From eb0d832f115bc6cb7a255e74a5ef291a82a85f52 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 13 Aug 2024 15:21:12 +0800 Subject: [PATCH 13/30] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasePlanDetail/index.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/api/wms/purchasePlanDetail/index.ts b/src/api/wms/purchasePlanDetail/index.ts index a436ab74a..d09baf96a 100644 --- a/src/api/wms/purchasePlanDetail/index.ts +++ b/src/api/wms/purchasePlanDetail/index.ts @@ -20,10 +20,12 @@ const getPageParams = (params)=>{ console.log('params.status',params.status) // 状态 - if(params.status&¶ms.status.length>0){ - params.statuss = params.status.join(',') + if(Array.isArray(params.status)){ + if(params.status&¶ms.status.length>0){ + params.statuss = params.status.join(',') + } + params.status = '' } - params.status = '' return params } // 查询要货计划子列表 From 89db9793e6f90aaeb5edafe29310f5ecefd533bc Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 15:28:56 +0800 Subject: [PATCH 14/30] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E5=AD=97=EF=BC=8C1.=20=E7=BF=BB=E5=8C=85=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E7=94=B3=E8=AF=B7=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=B8=AD=E4=B9=9F=E6=B2=A1=E6=9C=89=202.=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=94=B6=E6=96=99=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=8D=95=E5=8F=B7=E5=90=8D=E5=AD=97=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E6=96=99=E4=BB=BB=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packageoverRecordMain.data.ts | 16 ++++++++-------- .../purchasereceiptJobMain/index.vue | 3 ++- .../purchasereceiptRecordMain/index.vue | 6 ++++-- .../purchasereceiptRecordRefuseMain/index.vue | 5 +++-- .../purchasereceiptRequestMain/index.vue | 4 ++-- .../purchasereturnJobMain/index.vue | 3 ++- .../purchasereturnRecordMain/index.vue | 6 +++--- .../purchasereturnRequestMain/index.vue | 5 +++-- .../sparereceipt/sparereceiptJobMain/index.vue | 3 ++- .../sparereceiptRecordMain/index.vue | 3 ++- .../sparereceiptRequestMain/index.vue | 4 ++-- 11 files changed, 33 insertions(+), 25 deletions(-) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts index b4da910ea..ce27beb2c 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts @@ -11,14 +11,14 @@ export const PackageoverMain = useCrudSchemas(reactive([ width: 180 }, }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - }, + // { + // label: '申请单号', + // field: 'requestNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // }, { label: '任务单据号', field: 'jobNumber', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 80dbd8b06..6cf95dc4e 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -104,6 +104,7 @@ import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { getReportUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 采购收货任务主 defineOptions({ name: 'PurchasereceiptJobMain' }) @@ -363,7 +364,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params) - download.excel(data, '采购收货任务主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index b51dbbefd..8eb9603f4 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -115,6 +115,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { getReportUrl } from '@/utils/systemParam' + +import { formatDate } from '@/utils/formatTime' // 采购收货记录主 defineOptions({ name: 'PurchasereceiptRecordMain' }) const message = useMessage() // 消息弹窗 @@ -303,10 +305,10 @@ const handleExport = async () => { exportLoading.value = true if(routeName.value.includes('SCP')){ const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params) - download.excel(data, `${t('ts.采购收货记录主')}.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) }else{ const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params) - download.excel(data, `${t('ts.采购收货记录主')}.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } } catch { } finally { diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue index c96206f80..2dcb35833 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue @@ -115,6 +115,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { PurchasereceiptRefuseRequestTabsList } from '@/utils/disposition/tabsList' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { getReportUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 采购收货记录主 defineOptions({ name: 'PurchasereceiptRecordRefuseMain' }) const message = useMessage() // 消息弹窗 @@ -292,10 +293,10 @@ const handleExport = async () => { exportLoading.value = true if(routeName.value.includes('SCP')){ const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params) - download.excel(data, `${t('ts.采购收货记录主')}.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) }else{ const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordRefuseMain(tableObject.params) - download.excel(data, `${t('ts.采购拒收记录主')}.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } } catch { } finally { diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index d7dd91517..c05b715f6 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -762,7 +762,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params) - download.excel(data, '采购收货申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -838,7 +838,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '采购收货申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue index 07e80cbb0..e5365a2ca 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue @@ -73,6 +73,7 @@ import * as PurchasereturnJobMainApi from '@/api/wms/purchasereturnJobMain' import * as PurchasereturnJobDetailApi from '@/api/wms/purchasereturnJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 采购退货任务主 defineOptions({ name: 'PurchasereturnJobMain' }) @@ -238,7 +239,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params) - download.excel(data, '采购退货任务主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index e3e3e3a18..6765de99b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -70,6 +70,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { getAccessToken } from '@/utils/auth' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 采购退货记录主 defineOptions({ name: 'PurchasereturnRecordMain' }) @@ -170,12 +171,11 @@ const handleExport = async () => { exportLoading.value = true if(routeName.value.includes('SCP')){ const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params) - download.excel(data, `${t('ts.采购退货记录主')}.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) }else{ const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params) - download.excel(data, `${t('ts.采购退货记录主')}.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } - } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 2bf3d83ec..700d90eda 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -139,6 +139,7 @@ import { getAccessToken } from '@/utils/auth' import * as BalanceApi from '@/api/wms/balance' import { async } from '@antv/x6/lib/registry/marker/async' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 采购退货申请 defineOptions({ name: 'PurchasereturnRequestMain' }) @@ -758,7 +759,7 @@ const handleExport = async () => { const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain( tableObject.params ) - download.excel(data, '采购退货申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -983,7 +984,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '采购退货申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue index 76e6d66a4..b32591516 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue @@ -74,6 +74,7 @@ import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import {exportSparereceiptJobMain} from "@/api/wms/purchasereceiptJobMain"; +import { formatDate } from '@/utils/formatTime' // 备件收货任务主 defineOptions({ name: 'PurchasereceiptJobMain' }) @@ -259,7 +260,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params) - download.excel(data, '备件收货任务.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue index f5270ed4f..0682aad0b 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue @@ -85,6 +85,7 @@ const routeName = ref() routeName.value = route.name const tableColumns = ref([...PurchasereceiptRecordMain.allSchemas.tableColumns,...PurchasereceiptRecordDetail.allSchemas.tableMainColumns]) const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas) +import { formatDate } from '@/utils/formatTime' // 字段设置 更新主列表字段 const updataTableColumns = (val) => { @@ -160,7 +161,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params) - download.excel(data, '备件收货记录.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index 622c5196f..8020ef79d 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -561,7 +561,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params) - download.excel(data, '备件收货申请.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -628,7 +628,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '采购收货申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 From b293ddd40e642587ac9a53729931fc0fcfccdf47 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 15:30:16 +0800 Subject: [PATCH 15/30] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E6=96=99?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BB=BB=E5=8A=A1=E5=8D=95=E5=8F=B7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9=E6=88=90=E7=94=9F=E4=BA=A7=E6=94=B6?= =?UTF-8?q?=E6=96=99=E4=BB=BB=E5=8A=A1=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreceiptRecordMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts index 1401944b8..15e2231be 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts @@ -17,7 +17,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive isSearch: true }, { - label: '申请单号', + label: '生产收料任务单号', field: 'jobNumber', sort: 'custom', table: { From 1be20ceb6fefc7dcda35ae6e76e1f1c749ffc83f Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 13 Aug 2024 15:38:24 +0800 Subject: [PATCH 16/30] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BA=BA=E3=80=81=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factoryModeling/areabasic/areabasic.data.ts | 4 ++-- .../wms/basicDataManage/factoryModeling/dock/dock.data.ts | 4 ++-- .../basicDataManage/factoryModeling/location/location.data.ts | 4 ++-- .../factoryModeling/locationgroup/locationgroup.data.ts | 4 ++-- .../basicDataManage/factoryModeling/process/process.data.ts | 4 ++-- .../factoryModeling/productionline/productionline.data.ts | 4 ++-- .../factoryModeling/warehouse/warehouse.data.ts | 4 ++-- .../basicDataManage/factoryModeling/workshop/workshop.data.ts | 4 ++-- .../factoryModeling/workstation/workstation.data.ts | 4 ++-- .../systemSetting/accountcalendar/accountcalendar.data.ts | 4 ++-- .../systemSetting/currencyexchange/currencyexchange.data.ts | 4 ++-- .../systemSetting/systemcalendar/systemcalendar.data.ts | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts index dfa823146..257a5f71a 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts @@ -214,7 +214,7 @@ export const Area = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -237,7 +237,7 @@ export const Area = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts index dbbc72a7a..11a7c465a 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts @@ -252,7 +252,7 @@ export const Dock = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -275,7 +275,7 @@ export const Dock = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts index 1a74eea06..07ef0409c 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts @@ -392,7 +392,7 @@ export const Location = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -415,7 +415,7 @@ export const Location = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts index da5fdfbd5..70ee060af 100644 --- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts @@ -214,7 +214,7 @@ export const Locationgroup = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -237,7 +237,7 @@ export const Locationgroup = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts index 7f4690a51..6db2fb2f5 100644 --- a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts @@ -217,7 +217,7 @@ export const Process = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -240,7 +240,7 @@ export const Process = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts index 1e17db6d5..72cee3e30 100644 --- a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts @@ -227,7 +227,7 @@ export const Productionline = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -250,7 +250,7 @@ export const Productionline = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts index ffb93df3e..3f82b7907 100644 --- a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts @@ -156,7 +156,7 @@ export const Warehouse = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -179,7 +179,7 @@ export const Warehouse = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts index b7ea81be4..569ded4e1 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts @@ -124,7 +124,7 @@ export const Workshop = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -147,7 +147,7 @@ export const Workshop = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts index b8da1ff1c..cebf01a68 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts @@ -302,7 +302,7 @@ export const Workstation = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -325,7 +325,7 @@ export const Workstation = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts index 7d383b84d..6ce4163de 100644 --- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts @@ -246,7 +246,7 @@ export const Accountcalendar = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -269,7 +269,7 @@ export const Accountcalendar = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts index a0451761d..02366d873 100644 --- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts @@ -155,7 +155,7 @@ export const Currencyexchange = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -178,7 +178,7 @@ export const Currencyexchange = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts index 4e41b2ff4..c413767db 100644 --- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts @@ -179,7 +179,7 @@ export const Systemcalendar = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -202,7 +202,7 @@ export const Systemcalendar = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } From 365cc0d8d57983f6aa4d913c476e7d0e3bf66b03 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 15:46:33 +0800 Subject: [PATCH 17/30] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=89=E4=B8=AA=E9=A1=B5=E9=9D=A2=E5=90=88=E6=88=90=E4=B8=80?= =?UTF-8?q?=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/index.vue | 73 +- .../qms/inspectionJobProduction/addForm.vue | 1552 ----------------- .../qms/inspectionJobProduction/detail.vue | 194 --- .../qms/inspectionJobProduction/index.vue | 442 ----- .../inspectionJobMain.data.ts | 885 ---------- .../qms/inspectionJobPurchase/addForm.vue | 1552 ----------------- .../qms/inspectionJobPurchase/detail.vue | 194 --- src/views/qms/inspectionJobPurchase/index.vue | 442 ----- .../inspectionJobMain.data.ts | 885 ---------- 9 files changed, 56 insertions(+), 6163 deletions(-) delete mode 100644 src/views/qms/inspectionJobProduction/addForm.vue delete mode 100644 src/views/qms/inspectionJobProduction/detail.vue delete mode 100644 src/views/qms/inspectionJobProduction/index.vue delete mode 100644 src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts delete mode 100644 src/views/qms/inspectionJobPurchase/addForm.vue delete mode 100644 src/views/qms/inspectionJobPurchase/detail.vue delete mode 100644 src/views/qms/inspectionJobPurchase/index.vue delete mode 100644 src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index dc84cb9e6..c7e3423da 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -4,12 +4,7 @@ @@ -316,9 +311,8 @@ const showQualityReport = ref(false) const qualityReport = ref('') const checkQualityReport = async (row) => { showQualityReport.value = true - qualityReport.value =getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber + qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber } - /** 添加/修改操作 */ // const formRef = ref() @@ -457,11 +451,25 @@ const handleImport = () => { const searchFormClick = (searchData) => { let isHave = searchData?.filters?.some((item) => item.column == 'inspectionType') if (!isHave) { - searchData.filters.push({ - action: 'notIn', - column: 'inspectionType', - value: '1,4' - }) + if (route.name == 'inspectionJobProductionMain') { + searchData.filters.push({ + action: '==', + column: 'inspectionType', + value: '4' + }) + } else if (route.name == 'inspectionJobPurchaseMain') { + searchData.filters.push({ + action: '==', + column: 'inspectionType', + value: '1' + }) + } else { + searchData.filters.push({ + action: 'notIn', + column: 'excludeInspectionType', + value: '1,4' + }) + } } tableObject.params = { isSearch: true, @@ -469,13 +477,44 @@ const searchFormClick = (searchData) => { } getList() // 刷新当前列表 } - +const resetSearch = () => { + if (route.name == 'inspectionJobProductionMain') { + setSearchParams({ + available: true, + inspectionType: '4' + }) + } else if (route.name == 'inspectionJobPurchaseMain') { + setSearchParams({ + available: true, + inspectionType: '1' + }) + } else { + setSearchParams({ + available: true, + excludeInspectionType: '1,4' + }) + } +} /** 初始化 **/ onMounted(async () => { - tableObject.params = { - available: true, - excludeInspectionType: '1,4' + console.log(11,route.name) + if (route.name == 'inspectionJobProductionMain') { + tableObject.params = { + available: true, + inspectionType: '4' + } + } else if (route.name == 'inspectionJobPurchaseMain') { + tableObject.params = { + available: true, + inspectionType: '1' + } + } else { + tableObject.params = { + available: true, + excludeInspectionType: '1,4' + } } + getList() // importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate() }) diff --git a/src/views/qms/inspectionJobProduction/addForm.vue b/src/views/qms/inspectionJobProduction/addForm.vue deleted file mode 100644 index 6b2e16b28..000000000 --- a/src/views/qms/inspectionJobProduction/addForm.vue +++ /dev/null @@ -1,1552 +0,0 @@ - - - - diff --git a/src/views/qms/inspectionJobProduction/detail.vue b/src/views/qms/inspectionJobProduction/detail.vue deleted file mode 100644 index 3dc132caf..000000000 --- a/src/views/qms/inspectionJobProduction/detail.vue +++ /dev/null @@ -1,194 +0,0 @@ - - - - - diff --git a/src/views/qms/inspectionJobProduction/index.vue b/src/views/qms/inspectionJobProduction/index.vue deleted file mode 100644 index 04c960c99..000000000 --- a/src/views/qms/inspectionJobProduction/index.vue +++ /dev/null @@ -1,442 +0,0 @@ - - - diff --git a/src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts b/src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts deleted file mode 100644 index 802586cd9..000000000 --- a/src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts +++ /dev/null @@ -1,885 +0,0 @@ -import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter2 } from '@/utils/formatTime' -import { validateHanset, validateEmail } from '@/utils/validator' -import { dateFormatter } from '@/utils/formatTime' -import { validateTwoNum, validateSixNum } from '@/utils/validator' -const { t } = useI18n() // 国际化 -import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' -const resultEntryMethodList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY) -const featureTypeList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE) -const isCanUpdateList = [ - { - label: '是', - value: true - }, - { - label: '否', - value: false - } -] - -/** - * @returns {Array} 检验任务主表 - */ -export const InspectionJobMain = useCrudSchemas( - reactive([ - { - label: '编码', - field: 'number', - sort: 'custom', - isSearch: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 200, - fixed: 'left' - } - }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - isSearch: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 200 - } - }, - { - label: '发货单号', - field: 'asnNumber', - sort: 'custom', - isSearch: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 180 - } - }, - { - label: '供应商编码', - field: 'supplierCode', - sort: 'custom', - isSearch: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 175 - } - }, - { - label: '供应商名称', - field: 'supplierName', - sort: 'custom', - isSearch: false, - table: { - width: 175 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物料编码', - field: 'itemCode', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物料名称', - field: 'itemName', - sort: 'custom', - isSearch: false, - table: { - width: 175 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物料批次', - field: 'batch', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '参考订单号', - field: 'referenceOrderCode', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '参考订单行', - field: 'referenceOrderRow', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '参考凭证号', - field: 'referenceCertificateCode', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '参考凭证行', - field: 'referenceCertificateRow', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '检验方案编码', - field: 'inspectionSchemeCode', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 200 - } - }, - { - label: '批次', - field: 'inspectionBatch', - sort: 'custom', - isSearch: false, - isDetail: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '供应商批次', - field: 'supplierBatch', - sort: 'custom', - isSearch: false, - isDetail: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '检验批数量', - field: 'inspectionBatchAmount', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - // { - // label: '采样总数量', - // field: 'sampleTotalAmount', - // sort: 'custom', - // isSearch: false, - // form: { - // componentProps:{ - // disabled:true - // } - // }, - // table: { - // width: 150 - // } - // }, - { - label: '检验类型', - field: 'inspectionType', - sort: 'custom', - dictType: DICT_TYPE.INSPECTION_TYPE, - dictClass: 'string', - isSearch: false, - form: { - component: 'Select', - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '完成人', - field: 'completeUser', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isTable: false, - isDetail: false, - isSearch: true, - isTableForm: false, - isForm: false - }, - // { - // label: '检验批来源', - // field: 'inspectionBatchSource', - // sort: 'custom', - // isSearch: false, - // dictType: DICT_TYPE.INSPECTION_BATCH_SOURCE, - // dictClass: 'string', - // form:{ - // componentProps:{ - // disabled:true - // } - // }, - // table: { - // width: 150 - // } - // }, - { - label: '检验阶段', - field: 'inspectionStage', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '检验严格性', - field: 'inspectionStringency', - sort: 'custom', - isSearch: false, - dictType: DICT_TYPE.INSPECTION_SEVERITY, - dictClass: 'string', - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '计划开始时间', - field: 'planStartTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x', - disabled: true - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - { - label: '计划结束时间', - field: 'planEndTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x', - disabled: true - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - { - label: '检验水平', - field: 'inspectionLevel', - sort: 'custom', - isSearch: false, - dictType: DICT_TYPE.INSPECTION_LEVEL, - dictClass: 'string', - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: 'AQL值', - field: 'aqlValue', - sort: 'custom', - isSearch: false, - dictType: DICT_TYPE.BASIC_AQL, - dictClass: 'string', - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - // { - // label: '使用决策', - // field: 'usageDecision', - // sort: 'custom', - // isSearch: false, - // dictType: DICT_TYPE.USAGE_DECISION, - // form:{ - // componentProps:{ - // } - // } - // }, - // { - // label: '是否可用', - // field: 'available', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: 'TRUE', - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled:true - // } - // } - // }, - { - label: '承接人', - field: 'acceptUserName', - table: { - width: 130 - }, - isForm: false, - isTable: false, - isDetail: true - }, - { - label: '承接时间', - field: 'acceptTime', - isForm: false, - table: { - width: 180 - }, - isTable: false, - isDetail: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - - { - label: '收货时间', - field: 'deliveryTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - - { - label: '完成人', - field: 'completeUserName', - table: { - width: 130 - }, - isForm: false, - isTable: true, - isDetail: true - }, - { - label: '完成时间', - field: 'completeTime', - isForm: false, - table: { - width: 180 - }, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isForm: false, - isTable: true, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '是否可用', - field: 'available', - sort: 'custom', - isSearch: true, - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - search: { - value: 'TRUE' - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - table: { - width: 110 - } - }, - { - label: '包装号', - field: 'packageCode', - sort: 'custom', - isSearch: true, - isTable: false, - isForm: false, - tableForm: { - disabled: false - } - }, - { - label: '创建时间', - field: 'createTime', - isForm: false, - isTable: true, - table: { - width: 180 - }, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - }, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - } - }, - { - label: '创建者', - field: 'creator', - table: { - width: 130 - }, - isForm: false, - isTable: true - }, - { - label: '最后更新时间', - field: 'updateTime', - sort: 'custom', - isDetail: true, - isForm: false, - isTable: false, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - { - label: '最后更新者', - field: 'updater', - isDetail: true, - isForm: false, - isTable: false, - table: { - width: 150 - } - }, - - { - label: '操作', - field: 'action', - isForm: false, - isDetail: false, - table: { - width: 300, - fixed: 'right' - } - } - ]) -) - -//表单校验 -export const InspectionJobMainRules = reactive({ - // usageDecision: [required], -}) - -/** - * @returns {Array} 检验任务子表 - */ -export const InspectionJobDetail = useCrudSchemas( - reactive([ - { - label: '编码', - field: 'number', - sort: 'custom', - isSearch: true - }, - { - label: '检验方案模板编码', - field: 'inspectionCode', - sort: 'custom', - isSearch: true - }, - { - label: '描述', - field: 'processDescribe', - sort: 'custom', - isSearch: true - }, - { - label: '顺序号', - field: 'sequenceCode', - sort: 'custom', - isSearch: true, - form: { - component: 'InputNumber', - value: 0 - } - }, - { - label: '检验特性编号', - field: 'inspectionCharCode', - sort: 'custom', - isSearch: true - }, - { - label: '检验特性编码', - field: 'inspectionJobCharacteristicsRespVO.number', - sort: 'custom' - }, - { - label: '检验特性描述', - field: 'inspectionJobCharacteristicsRespVO.description', - sort: 'custom' - }, - { - label: '检验方法', - field: 'inspectionJobCharacteristicsRespVO.inspectionMethodCode', - sort: 'custom' - }, - { - label: '采样过程编码', - field: 'inspectionJobCharacteristicsRespVO.samplingProcessCode', - sort: 'custom' - }, - { - label: '动态修改规则编码', - field: 'inspectionJobCharacteristicsRespVO.dynamicUpdateCode', - sort: 'custom' - }, - { - label: '是否允许修改特征值', - field: 'inspectionJobCharacteristicsRespVO.isCanUpdate', - sort: 'custom', - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return isCanUpdateList.find((account) => account.value == cellValue)?.label - } - }, - { - label: '结果录入方式', - field: 'inspectionJobCharacteristicsRespVO.resultEntryMethod', - sort: 'custom', - // dictType: DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY, - // dictClass: 'string', - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return resultEntryMethodList.find((account) => account.value == cellValue)?.label - } - }, - { - label: '特征类型', - field: 'inspectionJobCharacteristicsRespVO.featureType', - sort: 'custom', - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return featureTypeList.find((account) => account.value == cellValue)?.label - } - } - ]) -) - -//表单校验 -export const InspectionJobDetailRules = reactive({ - taskCode: [required], - processCode: [required], - sequenceCode: [required], - available: [required] -}) -/** - * @returns {Array} 检验任务包装 - */ -export const InspectionJobPackage = useCrudSchemas( - reactive([ - { - label: '编码', - field: 'number', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true - }, - table: { - width: 200 - } - }, - { - label: '包装号', - field: 'packageCode', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true - }, - table: { - width: 200 - } - }, - { - label: '包装规格', - field: 'packageSpecificationCode', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true - }, - table: { - width: 180 - } - }, - { - label: '数量', - field: 'amount', - sort: 'custom', - isSearch: true, - form: { - component: 'InputNumber', - value: 0 - }, - tableForm: { - disabled: true - }, - table: { - width: 150 - } - }, - { - label: '计量单位', - field: 'measuringUnit', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true - }, - table: { - width: 150 - } - }, - { - label: '采样数量', - field: 'sampleAmount', - sort: 'custom', - isSearch: true, - isTable: false, - table: { - width: 150 - } - } - ]) -) -//表单校验 -export const InspectionJobPackageRules = reactive({ - sampleAmount: [required, { validator: validateSixNum, trigger: 'blur' }] -}) diff --git a/src/views/qms/inspectionJobPurchase/addForm.vue b/src/views/qms/inspectionJobPurchase/addForm.vue deleted file mode 100644 index 6b2e16b28..000000000 --- a/src/views/qms/inspectionJobPurchase/addForm.vue +++ /dev/null @@ -1,1552 +0,0 @@ - - - - diff --git a/src/views/qms/inspectionJobPurchase/detail.vue b/src/views/qms/inspectionJobPurchase/detail.vue deleted file mode 100644 index 3dc132caf..000000000 --- a/src/views/qms/inspectionJobPurchase/detail.vue +++ /dev/null @@ -1,194 +0,0 @@ - - - - - diff --git a/src/views/qms/inspectionJobPurchase/index.vue b/src/views/qms/inspectionJobPurchase/index.vue deleted file mode 100644 index 3b9d26dd4..000000000 --- a/src/views/qms/inspectionJobPurchase/index.vue +++ /dev/null @@ -1,442 +0,0 @@ - - - diff --git a/src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts b/src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts deleted file mode 100644 index fa86592bf..000000000 --- a/src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts +++ /dev/null @@ -1,885 +0,0 @@ -import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter2 } from '@/utils/formatTime' -import { validateHanset, validateEmail } from '@/utils/validator' -import { dateFormatter } from '@/utils/formatTime' -import { validateTwoNum, validateSixNum } from '@/utils/validator' -const { t } = useI18n() // 国际化 -import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' -const resultEntryMethodList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY) -const featureTypeList = getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE) -const isCanUpdateList = [ - { - label: '是', - value: true - }, - { - label: '否', - value: false - } -] - -/** - * @returns {Array} 检验任务主表 - */ -export const InspectionJobMain = useCrudSchemas( - reactive([ - { - label: '编码', - field: 'number', - sort: 'custom', - isSearch: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 200, - fixed: 'left' - } - }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - isSearch: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 200 - } - }, - { - label: '发货单号', - field: 'asnNumber', - sort: 'custom', - isSearch: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 180 - } - }, - { - label: '供应商编码', - field: 'supplierCode', - sort: 'custom', - isSearch: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 175 - } - }, - { - label: '供应商名称', - field: 'supplierName', - sort: 'custom', - isSearch: false, - table: { - width: 175 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物料编码', - field: 'itemCode', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物料名称', - field: 'itemName', - sort: 'custom', - isSearch: false, - table: { - width: 175 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物料批次', - field: 'batch', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '参考订单号', - field: 'referenceOrderCode', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '参考订单行', - field: 'referenceOrderRow', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '参考凭证号', - field: 'referenceCertificateCode', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '参考凭证行', - field: 'referenceCertificateRow', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '检验方案编码', - field: 'inspectionSchemeCode', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 200 - } - }, - { - label: '批次', - field: 'inspectionBatch', - sort: 'custom', - isSearch: false, - isDetail: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '供应商批次', - field: 'supplierBatch', - sort: 'custom', - isSearch: false, - isDetail: true, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '检验批数量', - field: 'inspectionBatchAmount', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - // { - // label: '采样总数量', - // field: 'sampleTotalAmount', - // sort: 'custom', - // isSearch: false, - // form: { - // componentProps:{ - // disabled:true - // } - // }, - // table: { - // width: 150 - // } - // }, - { - label: '检验类型', - field: 'inspectionType', - sort: 'custom', - dictType: DICT_TYPE.INSPECTION_TYPE, - dictClass: 'string', - isSearch: false, - form: { - component: 'Select', - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '完成人', - field: 'completeUser', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isTable: false, - isDetail: false, - isSearch: true, - isTableForm: false, - isForm: false - }, - // { - // label: '检验批来源', - // field: 'inspectionBatchSource', - // sort: 'custom', - // isSearch: false, - // dictType: DICT_TYPE.INSPECTION_BATCH_SOURCE, - // dictClass: 'string', - // form:{ - // componentProps:{ - // disabled:true - // } - // }, - // table: { - // width: 150 - // } - // }, - { - label: '检验阶段', - field: 'inspectionStage', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '检验严格性', - field: 'inspectionStringency', - sort: 'custom', - isSearch: false, - dictType: DICT_TYPE.INSPECTION_SEVERITY, - dictClass: 'string', - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: '计划开始时间', - field: 'planStartTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x', - disabled: true - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - { - label: '计划结束时间', - field: 'planEndTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x', - disabled: true - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - { - label: '检验水平', - field: 'inspectionLevel', - sort: 'custom', - isSearch: false, - dictType: DICT_TYPE.INSPECTION_LEVEL, - dictClass: 'string', - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - { - label: 'AQL值', - field: 'aqlValue', - sort: 'custom', - isSearch: false, - dictType: DICT_TYPE.BASIC_AQL, - dictClass: 'string', - form: { - componentProps: { - disabled: true - } - }, - table: { - width: 150 - } - }, - // { - // label: '使用决策', - // field: 'usageDecision', - // sort: 'custom', - // isSearch: false, - // dictType: DICT_TYPE.USAGE_DECISION, - // form:{ - // componentProps:{ - // } - // } - // }, - // { - // label: '是否可用', - // field: 'available', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: 'TRUE', - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled:true - // } - // } - // }, - { - label: '承接人', - field: 'acceptUserName', - table: { - width: 130 - }, - isForm: false, - isTable: false, - isDetail: true - }, - { - label: '承接时间', - field: 'acceptTime', - isForm: false, - table: { - width: 180 - }, - isTable: false, - isDetail: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - - { - label: '收货时间', - field: 'deliveryTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 175 - } - }, - - { - label: '完成人', - field: 'completeUserName', - table: { - width: 130 - }, - isForm: false, - isTable: true, - isDetail: true - }, - { - label: '完成时间', - field: 'completeTime', - isForm: false, - table: { - width: 180 - }, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isForm: false, - isTable: true, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '是否可用', - field: 'available', - sort: 'custom', - isSearch: true, - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - search: { - value: 'TRUE' - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - table: { - width: 110 - } - }, - { - label: '包装号', - field: 'packageCode', - sort: 'custom', - isSearch: true, - isTable: false, - isForm: false, - tableForm: { - disabled: false - } - }, - { - label: '创建时间', - field: 'createTime', - isForm: false, - table: { - width: 180 - }, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - }, - isTable: true, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - } - }, - { - label: '创建者', - field: 'creator', - table: { - width: 130 - }, - isForm: false, - isTable: true - }, - { - label: '最后更新时间', - field: 'updateTime', - sort: 'custom', - isDetail: true, - isForm: false, - isTable: false, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - { - label: '最后更新者', - field: 'updater', - isDetail: true, - isForm: false, - isTable: false, - table: { - width: 150 - } - }, - - { - label: '操作', - field: 'action', - isForm: false, - isDetail: false, - table: { - width: 300, - fixed: 'right' - } - } - ]) -) - -//表单校验 -export const InspectionJobMainRules = reactive({ - // usageDecision: [required], -}) - -/** - * @returns {Array} 检验任务子表 - */ -export const InspectionJobDetail = useCrudSchemas( - reactive([ - { - label: '编码', - field: 'number', - sort: 'custom', - isSearch: true - }, - { - label: '检验方案模板编码', - field: 'inspectionCode', - sort: 'custom', - isSearch: true - }, - { - label: '描述', - field: 'processDescribe', - sort: 'custom', - isSearch: true - }, - { - label: '顺序号', - field: 'sequenceCode', - sort: 'custom', - isSearch: true, - form: { - component: 'InputNumber', - value: 0 - } - }, - { - label: '检验特性编号', - field: 'inspectionCharCode', - sort: 'custom', - isSearch: true - }, - { - label: '检验特性编码', - field: 'inspectionJobCharacteristicsRespVO.number', - sort: 'custom' - }, - { - label: '检验特性描述', - field: 'inspectionJobCharacteristicsRespVO.description', - sort: 'custom' - }, - { - label: '检验方法', - field: 'inspectionJobCharacteristicsRespVO.inspectionMethodCode', - sort: 'custom' - }, - { - label: '采样过程编码', - field: 'inspectionJobCharacteristicsRespVO.samplingProcessCode', - sort: 'custom' - }, - { - label: '动态修改规则编码', - field: 'inspectionJobCharacteristicsRespVO.dynamicUpdateCode', - sort: 'custom' - }, - { - label: '是否允许修改特征值', - field: 'inspectionJobCharacteristicsRespVO.isCanUpdate', - sort: 'custom', - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return isCanUpdateList.find((account) => account.value == cellValue)?.label - } - }, - { - label: '结果录入方式', - field: 'inspectionJobCharacteristicsRespVO.resultEntryMethod', - sort: 'custom', - // dictType: DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY, - // dictClass: 'string', - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return resultEntryMethodList.find((account) => account.value == cellValue)?.label - } - }, - { - label: '特征类型', - field: 'inspectionJobCharacteristicsRespVO.featureType', - sort: 'custom', - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return featureTypeList.find((account) => account.value == cellValue)?.label - } - } - ]) -) - -//表单校验 -export const InspectionJobDetailRules = reactive({ - taskCode: [required], - processCode: [required], - sequenceCode: [required], - available: [required] -}) -/** - * @returns {Array} 检验任务包装 - */ -export const InspectionJobPackage = useCrudSchemas( - reactive([ - { - label: '编码', - field: 'number', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true - }, - table: { - width: 200 - } - }, - { - label: '包装号', - field: 'packageCode', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true - }, - table: { - width: 200 - } - }, - { - label: '包装规格', - field: 'packageSpecificationCode', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true - }, - table: { - width: 180 - } - }, - { - label: '数量', - field: 'amount', - sort: 'custom', - isSearch: true, - form: { - component: 'InputNumber', - value: 0 - }, - tableForm: { - disabled: true - }, - table: { - width: 150 - } - }, - { - label: '计量单位', - field: 'measuringUnit', - sort: 'custom', - isSearch: true, - tableForm: { - disabled: true - }, - table: { - width: 150 - } - }, - { - label: '采样数量', - field: 'sampleAmount', - sort: 'custom', - isSearch: true, - isTable: false, - table: { - width: 150 - } - } - ]) -) -//表单校验 -export const InspectionJobPackageRules = reactive({ - sampleAmount: [required, { validator: validateSixNum, trigger: 'blur' }] -}) From 04b7ce32572509be5993a8c5b6499e79fc23bc6c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 16:41:28 +0800 Subject: [PATCH 18/30] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E9=80=80=E8=B4=A7=EF=BC=8C=E9=87=87=E8=B4=AD=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=EF=BC=8C=E9=87=87=E8=B4=AD=E7=B4=A2=E8=B5=94=EF=BC=8C=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=E8=AE=B0=E5=BD=95,=E5=AF=BC=E5=87=BA=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E5=AD=97=EF=BC=8C=E6=A3=80=E9=AA=8C=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=92=8C=E8=AE=B0=E5=BD=95=E9=87=8D=E7=BD=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=88=B7=E6=96=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/index.vue | 30 ++++++++++--------- src/views/qms/inspectionRecord/index.vue | 27 +++++++++-------- .../inspect/inspectJobMain/index.vue | 3 +- .../inspect/inspectRecordMain/index.vue | 3 +- .../inspect/inspectRequestMain/index.vue | 5 ++-- .../purchasereturnRecordSpareMain/index.vue | 5 ++-- .../purchasereturnRequestSpareMain/index.vue | 3 +- .../putaway/putawayJobMain/index.vue | 3 +- .../putaway/putawayRecordMain/index.vue | 3 +- .../putaway/putawayRequestMain/index.vue | 5 ++-- .../purchaseclaimRecordMain/index.vue | 3 +- .../purchaseclaimRequestMain/index.vue | 5 ++-- 12 files changed, 55 insertions(+), 40 deletions(-) diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index c7e3423da..47f35526a 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -4,7 +4,7 @@ @@ -477,27 +477,30 @@ const searchFormClick = (searchData) => { } getList() // 刷新当前列表 } -const resetSearch = () => { - if (route.name == 'inspectionJobProductionMain') { - setSearchParams({ +/** 初始化 **/ +onMounted(async () => { + console.log(11,route.name) + if (route.name == 'inspectionJobProductionMain') { + tableObject.params = { available: true, inspectionType: '4' - }) + } } else if (route.name == 'inspectionJobPurchaseMain') { - setSearchParams({ + tableObject.params = { available: true, inspectionType: '1' - }) + } } else { - setSearchParams({ + tableObject.params = { available: true, excludeInspectionType: '1,4' - }) + } } -} -/** 初始化 **/ -onMounted(async () => { - console.log(11,route.name) + + getList() + // importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate() +}) +onActivated(() => { if (route.name == 'inspectionJobProductionMain') { tableObject.params = { available: true, @@ -516,6 +519,5 @@ onMounted(async () => { } getList() - // importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate() }) diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index 2cd165f05..75bc47e35 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -4,7 +4,7 @@ @@ -464,26 +464,29 @@ const searchFormClick = (searchData) => { } getList() // 刷新当前列表 } -const resetSearch = () => { - if (route.name == 'inspectionRecordPurchaseMain') { - setSearchParams({ + +/** 初始化 **/ +onMounted(async () => { + if (route.name == 'inspectionRecordPurchaseMain') { + tableObject.params = { available: true, inspectionType: '1' - }) + } } else if (route.name == 'inspectionRecordProductionMain') { - setSearchParams({ + tableObject.params = { available: true, inspectionType: '4' - }) + } } else { - setSearchParams({ + tableObject.params = { available: true, excludeInspectionType: '1,4,11' - }) + } } -} -/** 初始化 **/ -onMounted(async () => { + + getList() +}) +onActivated(() => { if (route.name == 'inspectionRecordPurchaseMain') { tableObject.params = { available: true, diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue index b2779c087..73a95c56b 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue @@ -73,6 +73,7 @@ import * as InspectJobMainApi from '@/api/wms/inspectJobMain' import * as InspectJobDetailApi from '@/api/wms/inspectJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' + import { formatDate } from '@/utils/formatTime' // 检验任务主 defineOptions({ name: 'InspectJobMain' }) @@ -233,7 +234,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await InspectJobMainApi.exportInspectJobMain(tableObject.params) - download.excel(data, '检验任务主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue index b7f63eff1..a987cad02 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue @@ -72,6 +72,7 @@ import * as InspectRecordDetailApi from '@/api/wms/inspectRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import Preview from '@/components/UploadFile/src/Preview.vue' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' + import { formatDate } from '@/utils/formatTime' // 检验记录主 defineOptions({ name: 'InspectRecordMain' }) @@ -179,7 +180,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await InspectRecordMainApi.exportInspectRecordMain(tableObject.params) - download.excel(data, '检验记录主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue index 91b579ad2..4cbc8f5df 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue @@ -53,6 +53,7 @@ import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain' import * as InspectRequestDetailApi from '@/api/wms/inspectRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' + import { formatDate } from '@/utils/formatTime' // 到货检验申请 defineOptions({ name: 'InspectRequestMain' }) @@ -322,7 +323,7 @@ // 发起导出 exportLoading.value = true const data = await InspectRequestMainApi.exportInspectRequestMain(tableObject.params) - download.excel(data, '检验申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -385,7 +386,7 @@ // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '检验申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue index 5f5e2b9ed..a2ec773c7 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue @@ -70,6 +70,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { getAccessToken } from '@/utils/auth' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { getJmreportBaseUrl } from '@/utils/systemParam' + import { formatDate } from '@/utils/formatTime' // 采购退货记录主 defineOptions({ name: 'PurchasereturnRecordSpareMain' }) @@ -170,10 +171,10 @@ const handleExport = async () => { exportLoading.value = true if(routeName.value.includes('SCP')){ const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params) - download.excel(data, `${t('ts.采购退货记录主')}.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) }else{ const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSpare(tableObject.params) - download.excel(data, `维修备件退货记录主.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } } catch { diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue index bea529f22..a5de550cc 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue @@ -141,6 +141,7 @@ import { getAccessToken } from '@/utils/auth' import * as BalanceApi from '@/api/wms/balance' import { async } from '@antv/x6/lib/registry/marker/async' import { getJmreportBaseUrl } from '@/utils/systemParam' + import { formatDate } from '@/utils/formatTime' // 采购退货申请 defineOptions({ name: 'PurchasereturnRequestSpareMain' }) @@ -708,7 +709,7 @@ const handleExport = async () => { const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMainSpare( tableObject.params ) - download.excel(data, '维修备件退货申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue index c4a0dd4b4..7dee1ed75 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue @@ -101,6 +101,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import {getAccessToken} from "@/utils/auth"; import { getJmreportBaseUrl } from '@/utils/systemParam' + import { formatDate } from '@/utils/formatTime' // 上架任务主 defineOptions({ name: 'PutawayJobMain' }) @@ -348,7 +349,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PutawayJobMainApi.exportPutawayJobMain(tableObject.params) - download.excel(data, '上架任务主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue index 3d07d9ad2..9aa5e6792 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue @@ -91,6 +91,7 @@ import * as PutawayRecordMainApi from '@/api/wms/putawayRecordMain' import * as PutawayRecordDetailApi from '@/api/wms/putawayRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' + import { formatDate } from '@/utils/formatTime' // 上架记录主 defineOptions({ name: 'PutawayRecordMain' }) @@ -211,7 +212,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PutawayRecordMainApi.exportPutawayRecordMain(tableObject.params) - download.excel(data, '上架记录主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue index 1223cadad..ad499e129 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue @@ -110,6 +110,7 @@ import { PutawayRequestMain, import * as PutawayRequestMainApi from '@/api/wms/putawayRequestMain' import * as PutawayRequestDetailApi from '@/api/wms/putawayRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' + import { formatDate } from '@/utils/formatTime' // 上架申请 defineOptions({ name: 'PutawayRequestMain' }) @@ -406,7 +407,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PutawayRequestMainApi.exportPutawayRequestMain(tableObject.params) - download.excel(data, '上架申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -475,7 +476,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '上架申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue index f3342060f..6784b9653 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue @@ -68,6 +68,7 @@ import * as PurchaseclaimRecordMainApi from '@/api/wms/purchaseclaimRecordMain' import * as PurchaseclaimRecordDetailApi from '@/api/wms/purchaseclaimRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' + import { formatDate } from '@/utils/formatTime' // 采购索赔记录主 defineOptions({ name: 'PurchaseclaimRecordMain' }) @@ -156,7 +157,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchaseclaimRecordMainApi.exportPurchaseclaimRecordMain(tableObject.params) - download.excel(data, '采购索赔记录主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue index d95021822..3b4377640 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue @@ -77,6 +77,7 @@ import BasicForm from '@/components/BasicForm/src/BasicForm.vue' import TableHead from '@/components/TableHead/src/TableHead.vue' import { getJmreportBaseUrl } from '@/utils/systemParam' + import { formatDate } from '@/utils/formatTime' // 供应商索赔申请 defineOptions({ name: 'PurchaseclaimRequestMain' }) @@ -414,7 +415,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' // 发起导出 exportLoading.value = true const data = await PurchaseclaimRequestMainApi.exportPurchaseclaimRequestMain(tableObject.params) - download.excel(data, '采购索赔申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -484,7 +485,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '采购索赔申请信息导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { From d9744242c72f74a7df5a4621f9261283159214ed Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Tue, 13 Aug 2024 16:43:22 +0800 Subject: [PATCH 19/30] =?UTF-8?q?WMS=20=E9=9C=80=E6=B1=82=EF=BC=9A?= =?UTF-8?q?=E5=88=B6=E5=93=81=E5=AD=90=E4=BB=B6=E6=8A=A5=E5=BA=9F=E4=B8=89?= =?UTF-8?q?=E7=BA=A7=E5=B1=95=E7=A4=BA=20=20=20=20=20bug=EF=BC=9A=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=BA=93=E5=8C=BA=E5=AF=BC=E5=85=A5=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productscrapRecordMain.data.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index 9274b2073..76301b377 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -498,14 +498,14 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - // { - // label: 'Bom版本', - // field: 'bomVersion', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, + { + label: 'Bom版本', + field: 'bomVersion', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '批次', field: 'batch', From 5d973867ee80ac48b7413edd4fa1a3396878244e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 17:07:08 +0800 Subject: [PATCH 20/30] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E4=B8=8A=E7=BA=BF=E7=BB=93=E7=AE=97=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/issueManage/issue/issueJobMain/index.vue | 3 ++- src/views/wms/issueManage/issue/issueRecordMain/index.vue | 3 ++- src/views/wms/issueManage/issue/issueRequestMain/index.vue | 5 +++-- .../onlinesettlement/onlinesettlementRecordMain/index.vue | 3 ++- .../onlinesettlement/onlinesettlementRequestMain/index.vue | 5 +++-- .../preparetoissueplan/preparetoissueMain/index.vue | 5 +++-- .../productionreceipt/productionreceiptJobMain/index.vue | 3 ++- .../productionreceipt/productionreceiptRecordMain/index.vue | 3 ++- .../wms/issueManage/repleinsh/repleinshJobMain/index.vue | 3 ++- .../wms/issueManage/repleinsh/repleinshRecordMain/index.vue | 3 ++- .../wms/issueManage/repleinsh/repleinshRequestMain/index.vue | 5 +++-- 11 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue index 5489eadbd..3236df4a8 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/index.vue +++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue @@ -74,6 +74,7 @@ import * as IssueJobDetailApi from '@/api/wms/issueJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { getDictLabel, DICT_TYPE } from '@/utils/dict' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 发料任务主 defineOptions({ name: 'IssueJobMain' }) @@ -300,7 +301,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await IssueJobMainApi.exportIssueJobMain(tableObject.params) - download.excel(data, '发料任务主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/issueManage/issue/issueRecordMain/index.vue b/src/views/wms/issueManage/issue/issueRecordMain/index.vue index 61c8326cd..1d33dadca 100644 --- a/src/views/wms/issueManage/issue/issueRecordMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRecordMain/index.vue @@ -68,6 +68,7 @@ import * as IssueRecordMainApi from '@/api/wms/issueRecordMain' import * as IssueRecordDetailApi from '@/api/wms/issueRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 发料记录主 defineOptions({ name: 'IssueRecordMain' }) @@ -156,7 +157,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await IssueRecordMainApi.exportIssueRecordMain(tableObject.params) - download.excel(data, '发料记录主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 2f8e7a6ab..cc0172aea 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -103,6 +103,7 @@ import * as IssueRequestMainApi from '@/api/wms/issueRequestMain' import * as IssueRequestDetailApi from '@/api/wms/issueRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as WorkstationApi from '@/api/wms/workstation' +import { formatDate } from '@/utils/formatTime' // 发料申请 defineOptions({ name: 'IssueRequestMain' }) @@ -443,7 +444,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await IssueRequestMainApi.exportIssueRequestMain(tableObject.params) - download.excel(data, '发料申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -545,7 +546,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '发料申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue index b4f8a8d89..6a4851095 100644 --- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue +++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue @@ -67,6 +67,7 @@ import * as OnlinesettlementRecordMainApi from '@/api/wms/onlinesettlementRecord import * as OnlinesettlementRecordDetailApi from '@/api/wms/onlinesettlementRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 上线结算记录主 defineOptions({ name: 'OnlinesettlementRecordMain' }) @@ -151,7 +152,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await OnlinesettlementRecordMainApi.exportOnlinesettlementRecordMain(tableObject.params) - download.excel(data, '上线结算记录主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue index ff16d1679..3ed7419cb 100644 --- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue +++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue @@ -86,6 +86,7 @@ import * as OnlinesettlementRequestMainApi from '@/api/wms/onlinesettlementReque import * as OnlinesettlementRequestDetailApi from '@/api/wms/onlinesettlementRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as SupplieritemApi from '@/api/wms/supplieritem' +import { formatDate } from '@/utils/formatTime' // 上线结算申请 defineOptions({ name: 'OnlinesettlementRequestMain' }) @@ -267,7 +268,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await OnlinesettlementRequestMainApi.exportOnlinesettlementRequestMain(tableObject.params) - download.excel(data, '上线结算申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -325,7 +326,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '上线结算申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue index 8ea4298e2..cbe5bb6f4 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue @@ -88,6 +88,7 @@ import * as PreparetoissueMainApi from '@/api/wms/preparetoissueMain' import * as PreparetoissueDetailApi from '@/api/wms/preparetoissueDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as ProductionlineitemApi from '@/api/wms/productionlineitem' +import { formatDate } from '@/utils/formatTime' // 备料计划 defineOptions({ name: 'PreparetoissueMain' }) @@ -458,7 +459,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PreparetoissueMainApi.exportPreparetoissueMain(tableObject.params) - download.excel(data, '备料计划主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -532,7 +533,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '备料计划主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue index 096a6dc78..c215034cd 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue @@ -73,6 +73,7 @@ import * as ProductionreceiptJobMainApi from '@/api/wms/productionreceiptJobMain import * as ProductionreceiptJobDetailApi from '@/api/wms/productionreceiptJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 生产收料任务主 defineOptions({ name: 'ProductionreceiptJobMain' }) @@ -300,7 +301,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionreceiptJobMainApi.exportProductionreceiptJobMain(tableObject.params) - download.excel(data, '生产收料任务.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue index 23ce2913b..7a21ef6bb 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue @@ -68,6 +68,7 @@ import * as ProductionreceiptRecordMainApi from '@/api/wms/productionreceiptReco import * as ProductionreceiptRecordDetailApi from '@/api/wms/productionreceiptRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 生产收料记录主 defineOptions({ name: 'ProductionreceiptRecordMain' }) @@ -156,7 +157,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionreceiptRecordMainApi.exportProductionreceiptRecordMain(tableObject.params) - download.excel(data, '生产收料记录主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue index c7d0035a6..b2ced7cb5 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue @@ -73,6 +73,7 @@ import { RepleinshJobMain,RepleinshJobMainRules,RepleinshJobDetail,RepleinshJobD import * as RepleinshJobMainApi from '@/api/wms/repleinshJobMain' import * as RepleinshJobDetailApi from '@/api/wms/repleinshJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 补料任务主 defineOptions({ name: 'RepleinshJobMain' }) @@ -328,7 +329,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await RepleinshJobMainApi.exportRepleinshJobMain(tableObject.params) - download.excel(data, '补料任务.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue index 5f1e898c8..3cd277407 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue @@ -67,6 +67,7 @@ import { RepleinshRecordMain,RepleinshRecordMainRules,RepleinshRecordDetail,Repl import * as RepleinshRecordMainApi from '@/api/wms/repleinshRecordMain' import * as RepleinshRecordDetailApi from '@/api/wms/repleinshRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 补料记录主 defineOptions({ name: 'RepleinshRecordMain' }) @@ -153,7 +154,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await RepleinshRecordMainApi.exportRepleinshRecordMain(tableObject.params) - download.excel(data, '补料记录主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue index f3ee228f1..f1429b571 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue @@ -87,6 +87,7 @@ import { RepleinshRequestMain,RepleinshRequestMainRules,RepleinshRequestDetail,R import * as RepleinshRequestMainApi from '@/api/wms/repleinshRequestMain' import * as RepleinshRequestDetailApi from '@/api/wms/repleinshRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 补料申请 defineOptions({ name: 'RepleinshRequestMain' }) @@ -344,7 +345,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await RepleinshRequestMainApi.exportRepleinshRequestMain(tableObject.params) - download.excel(data, '补料申请.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -423,7 +424,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '补料申请导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 From 41e25469fc3e0048bffdcedf47ac0c65fef3af58 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 13 Aug 2024 17:16:29 +0800 Subject: [PATCH 21/30] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?= =?UTF-8?q?=EF=BC=8C=E5=8F=91=E5=88=B0=E5=AF=84=E5=94=AE=E5=BA=93=E6=98=AF?= =?UTF-8?q?=E5=8E=BB=E5=8C=85=E8=A3=85=E7=9A=84=EF=BC=8C=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=97=B6=E7=8E=B0=E5=9C=A8=E6=98=AF=E5=B8=A6?= =?UTF-8?q?=E5=87=BA=E5=8C=85=E8=A3=85=E7=9A=84=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?pda=E7=9A=84=E5=8C=85=E8=A3=85=E4=B8=8D=E5=AF=B9=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E5=8E=BB=E6=8E=89=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=8C=85=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 82 +++++++++---------- .../customerreturnRequestMain/index.vue | 18 +++- 2 files changed, 58 insertions(+), 42 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 1a697012a..bf1e93890 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -882,47 +882,47 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive } } }, - { - label: '包装号', - field: 'packingNumber', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装号', - searchField: 'packingNumber', - searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, - searchPage: CustomerreturnRequestApi.pageItemCodeToBalance, - searchCondition: [{ - key:'customerCode', // 查询列表中字段 - value:'customerCode', // 指主表某字段 - message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 - isMainValue: true // 表示查询条件是主表的字段的值 - } - ] - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装号', - searchField: 'packingNumber', - searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, - searchPage: CustomerreturnRequestApi.pageItemCodeToBalance, - searchCondition: [{ - key:'customerCode', // 查询列表中字段 - value:'customerCode', // 指主表某字段 - message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 - isMainValue: true // 表示查询条件是主表的字段的值 - } - ] - } - } - }, + // { + // label: '包装号', + // field: 'packingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择包装号', + // searchField: 'packingNumber', + // searchTitle: '库存余额信息', + // searchAllSchemas: Balance.allSchemas, + // searchPage: CustomerreturnRequestApi.pageItemCodeToBalance, + // searchCondition: [{ + // key:'customerCode', // 查询列表中字段 + // value:'customerCode', // 指主表某字段 + // message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 + // isMainValue: true // 表示查询条件是主表的字段的值 + // } + // ] + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择包装号', + // searchField: 'packingNumber', + // searchTitle: '库存余额信息', + // searchAllSchemas: Balance.allSchemas, + // searchPage: CustomerreturnRequestApi.pageItemCodeToBalance, + // searchCondition: [{ + // key:'customerCode', // 查询列表中字段 + // value:'customerCode', // 指主表某字段 + // message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 + // isMainValue: true // 表示查询条件是主表的字段的值 + // } + // ] + // } + // } + // }, // { // label: '器具号', // field: 'containerNumber', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index b46e6663e..a6b1b8c67 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -220,6 +220,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => value = obj.fromLocationCode obj.fromLocationCode = obj.toLocationCode obj.toLocationCode = '' + obj.packingNumber = '' // 包装号所有为空 CustomerreturnRequestDetail.allSchemas.tableFormColumns.map(item =>{ if(item.field == 'packingNumber') { item.isInpuFocusShow = false @@ -319,6 +320,7 @@ const isShowMainButton = (row,val) => { } } + // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 @@ -336,7 +338,8 @@ const butttondata = (row,$index) => { { label: '生成标签', name: 'ssbq', - hide: isShowMainButton(row, ['3','6']), + // hide: isShowMainButton(row, ['3','6']), + hide: isShowMainButton(row, ['3']), type: 'primary', icon: '', color: '', @@ -407,6 +410,19 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainHandle') { // 处理 + // 判断 是否已创建标签 + let isCreateLabel = false + await PackageApi.getPackagePage({ + requestNumber: row.number + }).then(res => { + if (res) { + if (res.list.length > 0) isCreateLabel = true + } + }) + if (!isCreateLabel) { + message.warning('请先创建标签') + return + } await message.confirm('确认要处理吗？') tableObject.loading = true CustomerreturnRequestMainApi.handle(row.masterId).then(() => { From 56a78c5714b6d13dd5df359746841c5d5d672e70 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 17:29:58 +0800 Subject: [PATCH 22/30] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E6=89=80=E6=9C=89=E7=9A=84=E5=AF=BC=E5=87=BA=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturn/productionreturnJobMain/index.vue | 3 ++- .../productionreturn/productionreturnRecordMain/index.vue | 3 ++- .../productionreturn/productionreturnRequestMain/index.vue | 5 +++-- .../productionreturn/productionreturnRequestMainNo/index.vue | 5 +++-- .../productionscrap/productionscrapRecordMain/index.vue | 3 ++- .../productionscrap/productionscrapRequestMain/index.vue | 5 +++-- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue index 922094c35..76b2ea5a7 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue @@ -73,6 +73,7 @@ import * as ProductionreturnJobMainApi from '@/api/wms/productionreturnJobMain' import * as ProductionreturnJobDetailApi from '@/api/wms/productionreturnJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 生产退料任务主 defineOptions({ name: 'ProductionreturnJobMain' }) @@ -272,7 +273,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionreturnJobMainApi.exportProductionreturnJobMain(tableObject.params) - download.excel(data, '生产退料任务.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue index f367ebfdf..17197ae23 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue @@ -68,6 +68,7 @@ import * as ProductionreturnRecordMainApi from '@/api/wms/productionreturnRecord import * as ProductionreturnRecordDetailApi from '@/api/wms/productionreturnRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 生产退料记录主 and 隔离退料记录 defineOptions({ name: 'ProductionreturnRecordMain' }) @@ -157,7 +158,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMain(tableObject.params) - download.excel(data, '生产退料记录主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 7ed0e0d69..bcc489c2e 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -110,6 +110,7 @@ import * as ItembasicApi from '@/api/wms/itembasic' import * as PackageApi from '@/api/wms/package' import { getAccessToken } from '@/utils/auth' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 生产退料申请 defineOptions({ name: 'ProductionreturnRequestMain' }) @@ -607,7 +608,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionreturnRequestMainApi.exportProductionreturnRequestMain(tableObject.params) - download.excel(data, '生产退料合格申请.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -769,7 +770,7 @@ const labelPrint = async (row) => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '生产退料导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index 257dccab8..cf54e1ceb 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -112,6 +112,7 @@ import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 隔离退料申请 defineOptions({ name: 'ProductionreturnRequestMainNo' }) @@ -551,7 +552,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionreturnRequestMainNoApi.exportProductionreturnRequestMain(tableObject.params) - download.excel(data, '生产退料不合格申请.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -757,7 +758,7 @@ const importFormRef = ref() // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '隔离退料导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue index 7f402440b..a86d7465d 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue @@ -68,6 +68,7 @@ import * as ProductionscrapRecordMainApi from '@/api/wms/productionscrapRecordMa import * as ProductionscrapRecordDetailApi from '@/api/wms/productionscrapRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 生产退料记录主 defineOptions({ name: 'ProductionscrapRecordMain' }) @@ -156,7 +157,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionscrapRecordMainApi.exportProductionscrapRecordMain(tableObject.params) - download.excel(data, '线标报废记录.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 2e5272cea..706cfc44d 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -110,6 +110,7 @@ import * as ItembasicApi from '@/api/wms/itembasic' import * as PackageApi from '@/api/wms/package' import { getAccessToken } from '@/utils/auth' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 线标原料报废申请 defineOptions({ name: 'ProductionscrapRequestMain' }) @@ -607,7 +608,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionscrapRequestMainApi.exportProductionscrapRequestMain(tableObject.params) - download.excel(data, '线边原料报废申请.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -768,7 +769,7 @@ const labelPrint = async (row) => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '线边原料报废导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 From 3828bcaa50ba0d66b1360a34d07ecdddd141c78d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 17:57:15 +0800 Subject: [PATCH 23/30] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=92=8C=E9=A2=84=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6=E5=A4=B9=E5=90=8D=E5=AD=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionManage/productionplan/productionMain/index.vue | 5 +++-- .../productionplan/productionMainAssemble/index.vue | 5 +++-- .../productionplan/productionMainAssembleSparePart/index.vue | 3 ++- .../productionplan/productionMainPredictSparePart/index.vue | 5 +++-- .../productionplan/qadproductionplan/index.vue | 5 +++-- .../productreceipt/productreceiptJobMain/index.vue | 3 ++- .../productreceipt/productreceiptRecordMain/index.vue | 3 ++- .../productreceipt/productreceiptRequestMain/index.vue | 5 +++-- 8 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index c107abc6d..b00d63f2c 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -89,6 +89,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as ItemBasicApi from '@/api/wms/itembasic' import * as BomApi from "@/api/wms/bom"; import * as SwitchApi from '@/api/wms/switch' +import { formatDate } from '@/utils/formatTime' // 生产计划主 // 预生产计划 defineOptions({ name: 'ProductionMain' }) @@ -549,7 +550,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionMainApi.exportProductionMain(tableObject.params) - download.excel(data, '预生产计划.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -627,7 +628,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '生产计划导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index d9923a922..76d95435d 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -89,6 +89,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as ItemBasicApi from '@/api/wms/itembasic' import * as BomApi from "@/api/wms/bom"; import * as SwitchApi from '@/api/wms/switch' +import { formatDate } from '@/utils/formatTime' // 装配计划 defineOptions({ name: 'ProductionMainAssemble' }) @@ -512,7 +513,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionMainApi.exportProductionMainAssemble(tableObject.params) - download.excel(data, '装配计划.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -626,7 +627,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '装配计划导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index f289523a4..4e6129d82 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -89,6 +89,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as ItemBasicApi from '@/api/wms/itembasic' import * as BomApi from "@/api/wms/bom"; import * as SwitchApi from '@/api/wms/switch' +import { formatDate } from '@/utils/formatTime' // 装配备件计划 defineOptions({ name: 'ProductionMainASparePart' }) @@ -500,7 +501,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionMainApi.exportProductionMainAssembleSparePart(tableObject.params) - download.excel(data, '装配备件计划.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue index 3585c8f56..9f35454a4 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue @@ -89,6 +89,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as ItemBasicApi from '@/api/wms/itembasic' import * as BomApi from "@/api/wms/bom"; import * as SwitchApi from '@/api/wms/switch' +import { formatDate } from '@/utils/formatTime' // 预生产备件计划 defineOptions({ name: 'ProductionMainPredictSparePart' }) @@ -502,7 +503,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionMainApi.exportProductionMainPredictSparePart(tableObject.params) - download.excel(data, '预生产备件计划.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -619,7 +620,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '预生产备件计划导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue index 8897f1807..b75866a36 100644 --- a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue +++ b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'QadProductionPlanMain' }) @@ -214,7 +215,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await QadProductionPlanMainApi.exportQadProductionPlanMain(tableObject.params) - download.excel(data, 'QAD生产计划主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -229,7 +230,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: 'QAD生产计划主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue index 253fb0f49..24215192e 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue @@ -104,6 +104,7 @@ import { BackflushRecordDetailb } from "@/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data"; +import { formatDate } from '@/utils/formatTime' // 制品收货任务主 // 预生产收货任务主 defineOptions({ name: 'ProductreceiptJobMain' }) @@ -350,7 +351,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(tableObject.params) - download.excel(data, '制品收货任务.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index 8493a2bd0..3abac7cae 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -102,6 +102,7 @@ import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequest import { getAccessToken } from '@/utils/auth' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 制品收货记录主 // 预生产收货记录主 defineOptions({ name: 'ProductreceiptRecordMain' }) @@ -294,7 +295,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params) - download.excel(data, '制品收货记录主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index f5f87a731..1ba04efcc 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -150,6 +150,7 @@ import { getAccessToken } from '@/utils/auth' import dayjs from 'dayjs' import { getJmreportBaseUrl } from '@/utils/systemParam' import * as BomApi from "@/api/wms/bom"; +import { formatDate } from '@/utils/formatTime' // 制品收货申请 // 预生产收货申请 defineOptions({ name: 'ProductreceiptRequestMain' }) @@ -567,7 +568,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(tableObject.params) - download.excel(data, '制品收货申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -645,7 +646,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '制品收货申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 From 1d80c177d35f2d6f8baf119bd4007bb627a7a93c Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 13 Aug 2024 18:06:12 +0800 Subject: [PATCH 24/30] =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E7=AD=96=E7=95=A5?= =?UTF-8?q?=EF=BC=9A=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE-4=E4=B8=AA?= =?UTF-8?q?=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/downShelfStrategy/AddForm.vue | 139 +++++++++++++++++- 1 file changed, 131 insertions(+), 8 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index 7034e3a20..47ed9e9e9 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -310,7 +310,6 @@ v-model="warehouseType" placeholder="" style="width: 110px; margin-right: 10px" - @change="changeWarehouse" > - + + + + + + + + + + + + + + + + + + + + @@ -560,6 +597,10 @@ +