From fdb8e3085ebddff45fc2a1067837de0682b097cc Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 26 Jul 2024 10:12:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A6=96=E4=BB=B6=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionRecord/index.vue | 29 +- .../addForm.vue | 90 +++- .../qms/inspectionRecordFirst/detail.vue | 390 +++++++++++++++ src/views/qms/inspectionRecordFirst/index.vue | 270 ++++++++++ .../inspectionRecordFirstMain.data.ts | 467 ++++++++++++++++++ .../qms/inspectionRecordFirst/useAddForm.vue | 312 ++++++++++++ 6 files changed, 1527 insertions(+), 31 deletions(-) rename src/views/qms/{inspectionRecord => inspectionRecordFirst}/addForm.vue (93%) create mode 100644 src/views/qms/inspectionRecordFirst/detail.vue create mode 100644 src/views/qms/inspectionRecordFirst/index.vue create mode 100644 src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts create mode 100644 src/views/qms/inspectionRecordFirst/useAddForm.vue diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index b0f04af46..2d9930416 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -36,16 +36,7 @@ :formAllSchemas="InspectionRecordMain.allSchemas" @submitForm="submitForm" /> - - + { diff --git a/src/views/qms/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue similarity index 93% rename from src/views/qms/inspectionRecord/addForm.vue rename to src/views/qms/inspectionRecordFirst/addForm.vue index d804838f6..c424f330b 100644 --- a/src/views/qms/inspectionRecord/addForm.vue +++ b/src/views/qms/inspectionRecordFirst/addForm.vue @@ -570,8 +570,7 @@ import { getCurrentInstance } from 'vue' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import * as InspectionJobDetailApi from '@/api/qms/inspectionJob/inspectionJobDetail' import { SearchTable } from '@/components/SearchTable' -import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain' -import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage' +import * as InspectionRecordDetail from '@/api/qms/inspectionRecord/inspectionRecordDetail' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' @@ -730,9 +729,11 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any allSamplePieceSize.value = 0 //打开时候归0 if (row) { data.value = JSON.parse(JSON.stringify(row)) - nextTick(() => { - formMainRef.value.setValues(row) - }) + // nextTick(() => { + // formMainRef.value.setValues(row) + // }) + let list = await InspectionRecordDetail.getInspectionRecordDetailList(data.value.id) + await processList( data.value,list) } else { data.value = { code: '', @@ -751,6 +752,85 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any dialogVisible.value = true tabIndex = data.value.subList.length + 1 } + +// 渲染工序列表 +const processList =async (InspectionSchemeObj,list) => { + editableTabsValue.value = 1 + list.forEach((item, index) => { + item.name = index + 1 + item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO + item.isPass = '' //判断是否显示对号错误图标 + // 总数量值是 样品份数 乘 每份样品量 + allSamplePieceSize.value += parseFloat( + ( + parseFloat(item.samplingProcessRespVO.sampleQty) * + parseFloat(InspectionSchemeObj.samplePieceSize) + ).toFixed(6) + ) + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true + if (!item?.inspectionJobCharacteristicsUpdateReqVO?.recordInspectionQuantifyList) { + // 单个录入时 + if (item?.inspectionJobCharacteristicsUpdateReqVO?.resultEntryMethod == 2) { + // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] + for ( + let i = 0; + i < parseInt(item.samplingProcessRespVO.sampleQty); + i++ + ) { + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ + inspectionValue: '', //检验值 + qualitativeCode: '', //定性字典项值 + defectLevel: '', //缺陷级别 + qualifiedQuantity: '', //合格数量 + unqualifiedQuantity: '' //不合格数量 + }) + } + } else { + // 汇总录入时 + console.log(2333,item.inspectionJobCharacteristicsUpdateReqVO) + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ + inspectionValue: '', //检验值 + qualitativeCode: '', //定性字典项值 + defectLevel: '', //缺陷级别 + qualifiedQuantity: parseFloat( + ( + parseFloat(item.samplingProcessRespVO.sampleQty) * + parseFloat(InspectionSchemeObj.samplePieceSize) + ).toFixed(6) + ), //合格数量 + unqualifiedQuantity: '0' //不合格数量 + }) + } + } + + // 编辑判断上限下限目标值是否必填 + if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) { + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true + } else { + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false + } + if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit) { + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = true + } else { + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit'][0].required = false + } + if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget) { + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = true + } else { + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyTarget'][0].required = false + } + if (item.samplingProcessRespVO.evaluationMode == 1) { + rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = true + } else { + rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = false + } + }) + + data.value.subList = list +} defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗 import type { TabPaneName } from 'element-plus' diff --git a/src/views/qms/inspectionRecordFirst/detail.vue b/src/views/qms/inspectionRecordFirst/detail.vue new file mode 100644 index 000000000..857ac62bd --- /dev/null +++ b/src/views/qms/inspectionRecordFirst/detail.vue @@ -0,0 +1,390 @@ + + + + + diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue new file mode 100644 index 000000000..d2b7ecee3 --- /dev/null +++ b/src/views/qms/inspectionRecordFirst/index.vue @@ -0,0 +1,270 @@ + + + diff --git a/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts new file mode 100644 index 000000000..90947001d --- /dev/null +++ b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts @@ -0,0 +1,467 @@ +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, + isForm: false, + table: { + width: 200, + fixed: 'left' + } + }, + + { + label: '物料编码', + field: 'itemCode', + sort: 'custom', + isSearch: false, + isForm: false, + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + isSearch: false, + isForm: false, + table: { + width: 200 + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + isSearch: false, + isForm: false, + table: { + width: 150 + } + }, + { + label: '检验批次', + field: 'inspectionBatch', + sort: 'custom', + isSearch: false, + isForm: false, + table: { + width: 150 + } + }, + { + label: '检验批数量', + field: 'inspectionBatchAmount', + sort: 'custom', + isSearch: false, + isForm: false, + table: { + width: 150 + } + }, + { + label: '检验方案编码', + field: 'inspectionSchemeCode', + sort: 'custom', + isSearch: false, + isForm: false, + table: { + width: 200 + } + }, + + + { + 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: 200, + 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'} + ], +}) diff --git a/src/views/qms/inspectionRecordFirst/useAddForm.vue b/src/views/qms/inspectionRecordFirst/useAddForm.vue new file mode 100644 index 000000000..c430495c8 --- /dev/null +++ b/src/views/qms/inspectionRecordFirst/useAddForm.vue @@ -0,0 +1,312 @@ + + + + + From dce8b993b583d44efbc24090fef349f09626fe78 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Fri, 26 Jul 2024 11:31:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5bug?= =?UTF-8?q?=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=B0=91=E4=BC=A0=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelManage/locationLabel/index.vue | 4 +- .../labelManage/manufacturePackage/index.vue | 14 +-- .../labelManage/purchasePackage/index.vue | 14 +-- .../labelManage/utensilPackage/index.vue | 14 +-- .../countManage/count/countJobMain/index.vue | 14 +-- .../countManage/count/countPlanMain/index.vue | 2 +- .../count/countRecordMain/index.vue | 2 +- .../count/countRequestMain/index.vue | 6 +- .../countadjustRecordMain/index.vue | 4 +- .../countadjustRequestMain/index.vue | 6 +- .../containerinit/containerinitadd/index.vue | 2 +- .../wms/inventoryManage/package/index.vue | 16 ++-- .../containerRecordMain/index.vue | 2 +- .../packageManage/packagemergeMain/index.vue | 4 +- .../packageoverRecordMain/index.vue | 2 +- .../packageoverRequestMain/index.vue | 10 +- .../packageManage/packagesplitMain/index.vue | 4 +- .../onlinesettlementRequestMain/index.vue | 2 +- .../issueManage/pick/pickJobMain/index.vue | 2 +- .../issueManage/pick/pickRecordMain/index.vue | 2 +- .../pick/pickRequestMain/index.vue | 2 +- .../inventorychangeRecordMain/index.vue | 2 +- .../inventorychangeRequestMain/index.vue | 4 +- .../inventorymoveJobMain/index.vue | 2 +- .../inventorymoveRecordMain/index.vue | 4 +- .../inventorymoveRequestMain/index.vue | 12 +-- src/views/wms/moveManage/itemChange/index.vue | 10 +- .../purchaseclaimRecordMain/index.vue | 2 +- .../purchaseclaimRequestMain/index.vue | 44 ++++----- .../supplierinvoiceRecordMain/index.vue | 4 +- .../supplierinvoiceRequestMain/index.vue | 94 +++++++++---------- .../index.vue | 42 ++++----- 32 files changed, 174 insertions(+), 174 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue index c4a6ca187..b9607c6ff 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue @@ -68,7 +68,7 @@ const tableColumns = ref(Package.allSchemas.tableColumns) /** - * PurchasePackage type = PurchaseLabel 采购件标签记录页面 + * PurchasePackage type = PurchaseLabel 采购件标签记录页面 * ManufacturePackage type = MakeLabel 制造件标签记录页面 * UtensilPackage type = ContainerLabel 器具标签记录页面 * SupplierPackage type = PurchaseLabel 供应商发货标签记录(用采购标签) @@ -150,7 +150,7 @@ const openForm = (type: string, row?: number) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"labelBarbasic") } /** 删除按钮操作 */ diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index f055699ca..e3467083b 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -39,11 +39,11 @@ - { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"labelBarbasic") } /** 删除按钮操作 */ diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index 683dacecf..afe60badd 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -39,11 +39,11 @@ - { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"labelBarbasic") } /** 删除按钮操作 */ diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue index ef517c4e4..90eaa3478 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue @@ -39,11 +39,11 @@ - { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"labelBarbasic") } /** 删除按钮操作 */ diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index ed55fdef0..a20f145ae 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -65,11 +65,11 @@ /> - { } else if( val == 'done'){ // 完成 handleDone(row.id) } - + } /** 关闭按钮操作 */ @@ -270,7 +270,7 @@ const handleDone = async (id: number) => { await CountJobMainApi.doneCountJobMain(id) await getList() } catch { - + } } @@ -282,7 +282,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"jobCountMain") } /** 导出按钮操作 */ diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index cda7d8619..195ea6553 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -457,7 +457,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { // getAreaAllList() // getLocationgroupAllList() // getLocationAllList() - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"planCountMain") } // 详情打开的编辑的时候设置盘点范围值列表 const detailOpenForm = (type, row) => { diff --git a/src/views/wms/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue index f8603c0db..ab0a9db8b 100644 --- a/src/views/wms/countManage/count/countRecordMain/index.vue +++ b/src/views/wms/countManage/count/countRecordMain/index.vue @@ -154,7 +154,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"recordCountMain") } /** 导出按钮操作 */ diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue index 5b65dd4f1..9f5f3efda 100644 --- a/src/views/wms/countManage/count/countRequestMain/index.vue +++ b/src/views/wms/countManage/count/countRequestMain/index.vue @@ -97,7 +97,7 @@ @@ -284,7 +284,7 @@ const isShowGenerateMainButton = (row, val) => { const searchTableRef = ref() // 列表-操作按钮 const butttondata = (row,$index) => { - + return [ defaultButtons.mainListCloseBtn({hide: isShowMainButton(row, ['1', '2', '3', '4', '6']),hasPermi: 'wms:count-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide: isShowMainButton(row, ['5']),hasPermi: 'wms:count-request-main:reAdd'}), //重新添加 @@ -458,7 +458,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"requestCountMain") } /** 删除按钮操作 */ diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue index 0ea59d699..3b22a5f60 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue @@ -126,7 +126,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { - + return [] } @@ -140,7 +140,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"recordCountadjustMain") } /** 导出按钮操作 */ diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue index 58e2edbcc..68430d969 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue @@ -76,7 +76,7 @@ /> - @@ -266,7 +266,7 @@ const buttonTableClick = async (val, row) => { tableObject.loading = false console.log(err) }) - } else if (val == 'edit') { // 编辑 + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) @@ -288,7 +288,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"requestCountadjustMain") } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue index b2e734a86..036d0a32c 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue @@ -245,7 +245,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"transactionContainerMain") } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 8601b4fc8..387e54f14 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -39,11 +39,11 @@ - { if (item.field == 'itemName') { item.componentProps.disabled = true } - }) + }) }else { Package.allSchemas.formSchema.forEach((item) => { if (item.field == 'number') { @@ -197,7 +197,7 @@ const openForm =async (type: string, row?: number) => { if (item.field == 'itemName') { item.componentProps.disabled = true } - }) + }) } basicFormRef.value.open(type, row) } @@ -205,7 +205,7 @@ const openForm =async (type: string, row?: number) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"transactionPackage") } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue index 1c0177cee..f4dba5289 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -197,7 +197,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain") } /** 添加/修改操作 */ diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue index 8a544f9cf..03db5751b 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue @@ -128,7 +128,7 @@ const buttonTableClick = async (val, row) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"recordPackagemergeMain") } /** 导出按钮操作 */ @@ -160,4 +160,4 @@ const searchFormClick = (searchData) => { onMounted(async () => { getList() }) - \ No newline at end of file + diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue index 6ec1b7dbd..493689051 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue @@ -172,7 +172,7 @@ const handlePoint = async (row) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"recordPackageoverMain") } /** 导出按钮操作 */ diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 7f99c50dc..14e25e038 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -74,7 +74,7 @@ /> - @@ -125,7 +125,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromPackQty'] = item['packQty'] tableData.value.push(newRow) }) - + } else if (formField == 'toPackUnit') { row['toPackUnit'] = val[0]['packUnit'] row['toPackQty'] = val[0]['packQty'] @@ -196,7 +196,7 @@ const HeadButttondata = [ // }, ] -const labelType = ref('') // 标签类别 采购还是制造等 +const labelType = ref('') // 标签类别 采购还是制造等 // 头部按钮事件 const buttonBaseClick = (val, item) => { @@ -317,7 +317,7 @@ const buttonTableClick = async (val, row) => { tableObject.loading = false console.log(err) }) - } else if (val == 'edit') { // 编辑 + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.masterId) @@ -340,7 +340,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"requestPackageoverMain") } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue index 0b8be995a..ea18981cc 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue @@ -128,7 +128,7 @@ const buttonTableClick = async (val, row) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"recordPackagesplitMain") } /** 导出按钮操作 */ @@ -160,4 +160,4 @@ const searchFormClick = (searchData) => { onMounted(async () => { getList() }) - \ No newline at end of file + diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue index b21efc68b..ff16d1679 100644 --- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue +++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue @@ -240,7 +240,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"requestOnlinesettlementMain") } /** 删除按钮操作 */ diff --git a/src/views/wms/issueManage/pick/pickJobMain/index.vue b/src/views/wms/issueManage/pick/pickJobMain/index.vue index fca7919b6..f15a0df81 100644 --- a/src/views/wms/issueManage/pick/pickJobMain/index.vue +++ b/src/views/wms/issueManage/pick/pickJobMain/index.vue @@ -203,7 +203,7 @@ const buttonTableClick = async (val, row) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"jobPickMain") } /** 导出按钮操作 */ diff --git a/src/views/wms/issueManage/pick/pickRecordMain/index.vue b/src/views/wms/issueManage/pick/pickRecordMain/index.vue index 87352f916..452cf87da 100644 --- a/src/views/wms/issueManage/pick/pickRecordMain/index.vue +++ b/src/views/wms/issueManage/pick/pickRecordMain/index.vue @@ -136,7 +136,7 @@ const buttonTableClick = async (val, row) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"recordStockupMain") } /** 导出按钮操作 */ diff --git a/src/views/wms/issueManage/pick/pickRequestMain/index.vue b/src/views/wms/issueManage/pick/pickRequestMain/index.vue index 38f9777c0..f33209171 100644 --- a/src/views/wms/issueManage/pick/pickRequestMain/index.vue +++ b/src/views/wms/issueManage/pick/pickRequestMain/index.vue @@ -245,7 +245,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"requestStockupMain") } /** 删除按钮操作 */ diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue index c1ba6e857..1160b62f2 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue @@ -190,7 +190,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"recordInventorychangeMain") } /** 导出按钮操作 */ diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 7c0b349df..b2eba54fc 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -165,7 +165,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else { row[formField] = val[0][searchField] } - + } else { const setV = {} setV[formField] = val[0][searchField] @@ -378,7 +378,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"requestInventorychangeMain") } /** 删除按钮操作 */ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue index 1c749d79f..582b7104b 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue @@ -288,7 +288,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"jobInventorymoveMain") } /** 导出按钮操作 */ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue index b788e1f57..aebbaa0dc 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue @@ -60,7 +60,7 @@ :apiPage="InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage" /> - @@ -213,7 +213,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"recordInventorymoveMain") } /** 导出按钮操作 */ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index d848a5834..42a7afe8b 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -77,7 +77,7 @@ /> - @@ -611,7 +611,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { fromWarehouseCodeMain.value = row.fromWarehouseCode const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"requestInventorymoveMain") } /** 删除按钮操作 */ @@ -694,7 +694,7 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } - data.subList = tableData.value // 拼接子表数据参数 + data.subList = tableData.value // 拼接子表数据参数 let isExist = false tableData.value.forEach(item => { let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber == item.fromPackingNumber) ) @@ -711,13 +711,13 @@ const submitForm = async (formType, submitData) => { if(fromInventoryStatus.value){ item.fromInventoryStatus = fromInventoryStatus.value item.toInventoryStatus = toInventoryStatus.value - } + } if(item.qty == 0){ message.error(`到数量不能为0!`) flag.value = true return; - } - }) + } + }) if(flag.value){ formRef.value.formLoading = false return diff --git a/src/views/wms/moveManage/itemChange/index.vue b/src/views/wms/moveManage/itemChange/index.vue index 0e1632f26..aeee4dfea 100644 --- a/src/views/wms/moveManage/itemChange/index.vue +++ b/src/views/wms/moveManage/itemChange/index.vue @@ -103,7 +103,7 @@ const HeadButttondata = [ // }, ] -// 头部按钮事件 +// 头部按钮事件 const buttonBaseClick = (val, item) => { if (val == 'add') { // 新增 openForm('create') @@ -120,7 +120,7 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else { // 其他按钮 console.log('其他按钮', item) } } @@ -131,7 +131,7 @@ const butttondata = [ // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 ] -// 列表-操作按钮事件 +// 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 openForm('update', row) @@ -150,7 +150,7 @@ const openForm = (type: string, row?: any) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"transactionBalance") } /** 删除按钮操作 */ @@ -229,4 +229,4 @@ onMounted(async () => { getList() // importTemplateData.templateUrl = await BalanceApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue index 38483b3ed..f3342060f 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue @@ -144,7 +144,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"recordPurchaseclaimMain") } /** 导出按钮操作 */ diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue index c87d8c806..d95021822 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue @@ -29,35 +29,35 @@ - - @@ -181,7 +181,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' // }, ] - // 头部按钮事件 + // 头部按钮事件 const buttonBaseClick = (val, item) => { if (val == 'add') { // 新增 openForm('create') @@ -198,7 +198,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else { // 其他按钮 console.log('其他按钮', item) } } @@ -241,7 +241,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' } } - // 列表-操作按钮事件 + // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainPurPlanOpe') { // 打开 handleOpe(row.id) @@ -283,7 +283,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' const openDetail = (row : any, titleName : any, titleValue : any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"requestPurchaseclaimMain") } /** 删除按钮操作 */ @@ -302,8 +302,8 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' tableObject.loading = false } } - - + + /** 关闭按钮操作 */ const handleClo = async (id : number) => { try { @@ -320,7 +320,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' tableObject.loading = false } } - + /** 打开按钮操作 */ const handleOpe = async (id : number) => { try { @@ -337,7 +337,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' tableObject.loading = false } } - + /** 提交审批按钮操作 */ const handleSub = async (id : number) => { try { @@ -354,7 +354,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' tableObject.loading = false } } - + /** 审批通过按钮操作 */ const handleApp = async (id : number) => { try { @@ -371,7 +371,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' tableObject.loading = false } } - + /** 驳回按钮操作 */ const handleTur = async (id : number) => { try { @@ -388,7 +388,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' tableObject.loading = false } } - + /** 处理按钮操作 */ const genRecords = async (id : number) => { try { diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 54788dd53..6fb5bc13c 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -17,7 +17,7 @@ { if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"recordSupplierinvoiceMain") } const searchList = (model)=>{ if(model.postingDate&&model.postingDate.length>1){ diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 85e48838f..61ae6ee6b 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -5,14 +5,14 @@ - @@ -41,18 +41,18 @@ - - + > +
@@ -66,6 +66,9 @@ 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 { useUserStore } from '@/store/modules/user' +const userStore = useUserStore() + defineOptions({ name: 'InspectionQ1' }) const message = useMessage() // 消息弹窗 @@ -105,9 +108,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:q1:import'}), // 导入 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'qms:Q1:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'qms:Q1:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'qms:Q1:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -137,11 +140,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row,val) => { + if (val.indexOf(row.status) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:q1:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:q1:delete'}), // 删除 -] +const butttondata = (row) => { + return [ + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q1:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q1:delete'}), // 删除 + defaultButtons.mainListFinishBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q1:finish'}), // 完成 + ] +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -149,9 +163,20 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + }else if (val == 'finish') { // 删除 + handleFinish(row.id) } } +const handleFinish = async (id: number) => { + try { + await Q1Api.finishQ1(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -159,7 +184,8 @@ const openForm = (type: string, row?: any) => { } // form表单提交 -const formsSuccess = async (formType,data) => { +const formsSuccess = async (formType, data) => { + data.responUser = userStore.getUser.id var isHave =Q1.allSchemas.formSchema.some(function (item) { return item.field === 'activeTime' || item.field === 'expireTime'; }); diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts index 0acc3299c..9e884dfba 100644 --- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts +++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts @@ -10,6 +10,9 @@ import { Customeritem } from '@/views/wms/basicDataManage/customerManage/custome import * as QadCostcentreApi from '@/api/wms/qadCostcentre' import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data' +import { useUserStore } from '@/store/modules/user' +const userStore = useUserStore() + // 表单校验 export const Q1Rules = reactive({ customerCode: [required], @@ -32,10 +35,10 @@ export const Q1 = useCrudSchemas( sort: 'custom', isForm: false, isSearch: true, - table: { + table: { width: 150, fixed: 'left' - }, + } }, { label: '状态', @@ -164,7 +167,7 @@ export const Q1 = useCrudSchemas( label: '编码', field: 'code', sort: 'custom', - dictType: DICT_TYPE.UOM, + dictType: DICT_TYPE.QMS_CODE, dictClass: 'string', isSearch: false, isTable: true, @@ -176,7 +179,7 @@ export const Q1 = useCrudSchemas( label: '优先级', field: 'priority', sort: 'custom', - dictType: DICT_TYPE.UOM, + dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY, dictClass: 'string', isSearch: false, isTable: true, @@ -188,7 +191,14 @@ export const Q1 = useCrudSchemas( label: '负责用户', field: 'responUser', sort: 'custom', - isSearch: false + isSearch: false, + isForm: true, + form: { + componentProps: { + value: userStore.getUser.nickname, + disabled: true + } + } }, { label: '索赔金额', @@ -232,7 +242,7 @@ export const Q1 = useCrudSchemas( label: '索赔原因', field: 'claimReason', sort: 'custom', - dictType: DICT_TYPE.UOM, + dictType: DICT_TYPE.CLAIM_REASON, dictClass: 'string', isSearch: false, isTable: true, @@ -281,7 +291,7 @@ export const Q1 = useCrudSchemas( component: 'DatePicker', componentProps: { type: 'datetime', - valueFormat: 'x' + valueFormat: 'x', } } }, diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 5731edb26..2cd99ee16 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -33,7 +33,7 @@ @@ -66,6 +66,9 @@ 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 { useUserStore } from '@/store/modules/user' +const userStore = useUserStore() + defineOptions({ name: 'InspectionQ2' }) const message = useMessage() // 消息弹窗 @@ -113,9 +116,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:q2:import'}), // 导入 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'qms:Q2:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'qms:Q2:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'qms:Q2:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -145,11 +148,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row,val) => { + if (val.indexOf(row.status) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:q2:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:q2:delete'}), // 删除 -] +const butttondata = (row) => { + return [ + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q2:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q2:delete'}), // 删除 + defaultButtons.mainListFinishBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q2:finish'}), // 完成 + ] +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -157,9 +171,20 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + }else if (val == 'finish') { // 删除 + handleFinish(row.id) } } +const handleFinish = async (id: number) => { + try { + await Q2Api.finishQ2(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -167,7 +192,8 @@ const openForm = (type: string, row?: any) => { } // form表单提交 -const formsSuccess = async (formType,data) => { +const formsSuccess = async (formType, data) => { + data.responUser = userStore.getUser.id var isHave =Q2.allSchemas.formSchema.some(function (item) { return item.field === 'activeTime' || item.field === 'expireTime'; }); diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 2ec6ee0e1..9085a2ffd 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -16,6 +16,9 @@ import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/su import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' import { PurchasereceiptRecordMain1 } from '@/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data' +import { useUserStore } from '@/store/modules/user' +const userStore = useUserStore() + // 表单校验 export const Q2Rules = reactive({ number: [required], @@ -232,7 +235,7 @@ export const Q2 = useCrudSchemas( label: '编码', field: 'code', sort: 'custom', - dictType: DICT_TYPE.UOM, + dictType: DICT_TYPE.QMS_CODE, dictClass: 'string', isSearch: false, isTable: true, @@ -245,7 +248,7 @@ export const Q2 = useCrudSchemas( label: '优先级', field: 'priority', sort: 'custom', - dictType: DICT_TYPE.UOM, + dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY, dictClass: 'string', isSearch: false, isTable: true, @@ -257,7 +260,14 @@ export const Q2 = useCrudSchemas( label: '负责用户', field: 'responUser', sort: 'custom', - isSearch: false + isSearch: false, + isForm: true, + form: { + componentProps: { + value: userStore.getUser.nickname, + disabled: true + } + } }, { label: '索赔金额', diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue index 18b256c52..5475b9717 100644 --- a/src/views/qms/inspectionQ3/index.vue +++ b/src/views/qms/inspectionQ3/index.vue @@ -33,7 +33,7 @@ @@ -66,6 +66,9 @@ 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 { useUserStore } from '@/store/modules/user' +const userStore = useUserStore() + defineOptions({ name: 'InspectionQ3' }) const message = useMessage() // 消息弹窗 @@ -82,7 +85,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { const setV = {} if(formField == 'itemCode'){ console.log(val); - setV['uom'] = val[0]['customerUom'] + setV['uom'] = val[0]['uom'] } if (formField == 'q1Number') { console.log(123) @@ -107,9 +110,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:q3:import'}), // 导入 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'qms:Q3:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'qms:Q3:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'qms:Q3:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -139,11 +142,22 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row,val) => { + if (val.indexOf(row.status) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:q3:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:q3:delete'}), // 删除 -] +const butttondata = (row) => { + return [ + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q3:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q3:delete'}), // 删除 + defaultButtons.mainListFinishBtn({hide:isShowMainButton(row,['0']),hasPermi:'qms:Q3:finish'}), // 完成 + ] +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -151,9 +165,20 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + }else if (val == 'finish') { // 删除 + handleFinish(row.id) } } +const handleFinish = async (id: number) => { + try { + await Q3Api.finishQ3(id) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { @@ -161,7 +186,8 @@ const openForm = (type: string, row?: any) => { } // form表单提交 -const formsSuccess = async (formType,data) => { +const formsSuccess = async (formType, data) => { + data.responUser = userStore.getUser.id var isHave =Q3.allSchemas.formSchema.some(function (item) { return item.field === 'activeTime' || item.field === 'expireTime'; }); diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts index 2e002b789..62606af62 100644 --- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts +++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts @@ -7,8 +7,11 @@ import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data' import * as QadCostcentreApi from '@/api/wms/qadCostcentre' import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data' -import * as CustomeritemApi from '@/api/wms/customeritem' -import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data' +import * as ItembasicApi from '@/api/wms/itembasic' +import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' + +import { useUserStore } from '@/store/modules/user' +const userStore = useUserStore() // 表单校验 export const Q3Rules = reactive({ @@ -93,40 +96,37 @@ export const Q3 = useCrudSchemas( table: { width: 150 }, - isSearch: true, + tableForm: { + isInpuFocusShow: true, + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '物料基础信息', // 查询弹窗标题 + searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 + searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + }, form: { // labelMessage: '信息提示说明！！！', componentProps: { - enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 - searchField: 'itemCode', // 查询弹窗赋值字段 - searchTitle: '客户物料信息', // 查询弹窗标题 - searchAllSchemas: Customeritem.allSchemas, // 查询弹窗所需类 - searchPage: CustomeritemApi.getCustomeritemPage, // 查询弹窗所需分页方法 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '物料基础信息', // 查询弹窗标题 + searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 + searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 searchCondition: [ { key: 'available', value: 'TRUE', isMainValue: false - }, - { - key: 'customerCode', - value: 'customerCode', - message: '请填写客户代码！', - isMainValue: true - } - ], - verificationParams: [ - { - key: 'itemCode', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true } - ] // 失去焦点校验参数 + ] } } }, @@ -165,7 +165,7 @@ export const Q3 = useCrudSchemas( label: '编码', field: 'code', sort: 'custom', - dictType: DICT_TYPE.UOM, + dictType: DICT_TYPE.QMS_CODE, dictClass: 'string', isSearch: false, isTable: true, @@ -173,36 +173,47 @@ export const Q3 = useCrudSchemas( type: 'Select' } }, - { label: '缺陷位置', field: 'defectLocation', sort: 'custom', + dictType: DICT_TYPE.DEFECT_LOCATION, + dictClass: 'string', isSearch: false, - isTable: false + isTable: true, + tableForm: { + type: 'Select' + } }, { label: '缺陷类型', field: 'defectType', sort: 'custom', + dictType: DICT_TYPE.DEFECT_TYPE, + dictClass: 'string', isSearch: false, - isTable: false, - form: { - component: 'SelectV2' + isTable: true, + tableForm: { + type: 'Select' } }, { label: '问题原因', field: 'problemReason', sort: 'custom', + dictType: DICT_TYPE.PROBLEM_REASON, + dictClass: 'string', isSearch: false, - isTable: false + isTable: true, + tableForm: { + type: 'Select' + } }, { label: '优先级', field: 'priority', sort: 'custom', - dictType: DICT_TYPE.UOM, + dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY, dictClass: 'string', isSearch: false, isTable: true, @@ -214,7 +225,14 @@ export const Q3 = useCrudSchemas( label: '负责用户', field: 'responUser', sort: 'custom', - isSearch: false + isSearch: false, + isForm: true, + form: { + componentProps: { + value: userStore.getUser.nickname, + disabled: true + } + } }, { label: '金额', @@ -235,12 +253,12 @@ export const Q3 = useCrudSchemas( sort: 'custom', isSearch: false, isTable: false, - isForm: false, + isForm: true, form: { // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchListPlaceholder: '请选择成本中心', // 输入框占位文本 searchField: 'costcentreCode', // 查询弹窗赋值字段 searchTitle: '成本中心信息', // 查询弹窗标题 searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类 @@ -297,7 +315,8 @@ export const Q3 = useCrudSchemas( label: '是否可用', field: 'available', sort: 'custom', - isSearch: false + isSearch: false, + isForm: false }, { label: '创建时间',