From 8757d108004dd4114326a463f66384167d804c9d Mon Sep 17 00:00:00 2001 From: gaojs Date: Wed, 10 Apr 2024 08:44:35 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=8B=86=E8=A7=A3?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/dismantlingDetail/index.ts | 56 ++++++ src/utils/dict.ts | 4 + .../dismantlingMain/dismantlingMain.data.ts | 181 +++++++++++++++++- src/views/mes/dismantlingMain/index.vue | 30 ++- 4 files changed, 267 insertions(+), 4 deletions(-) create mode 100644 src/api/mes/dismantlingDetail/index.ts diff --git a/src/api/mes/dismantlingDetail/index.ts b/src/api/mes/dismantlingDetail/index.ts new file mode 100644 index 000000000..e9baec03e --- /dev/null +++ b/src/api/mes/dismantlingDetail/index.ts @@ -0,0 +1,56 @@ +import request from '@/config/axios' + +export interface DismantlingDetailVO { + deleteTime: Date + id: number + status: string + concurrencyStamp: number + remark: string + deleter: string + siteId: number + mainBiilno: string + materialCode: string + materialStauts: string + materialProcessstauts: string +} + +// 查询报废拆解明细列表 +export const getDismantlingDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/mes/dismantling-detail/senior', data }) + } else { + return await request.get({ url: `/mes/dismantling-detail/page`, params }) + } +} + +// 查询报废拆解明细详情 +export const getDismantlingDetail = async (id: number) => { + return await request.get({ url: `/mes/dismantling-detail/get?id=` + id }) +} + +// 新增报废拆解明细 +export const createDismantlingDetail = async (data: DismantlingDetailVO) => { + return await request.post({ url: `/mes/dismantling-detail/create`, data }) +} + +// 修改报废拆解明细 +export const updateDismantlingDetail = async (data: DismantlingDetailVO) => { + return await request.put({ url: `/mes/dismantling-detail/update`, data }) +} + +// 删除报废拆解明细 +export const deleteDismantlingDetail = async (id: number) => { + return await request.delete({ url: `/mes/dismantling-detail/delete?id=` + id }) +} + +// 导出报废拆解明细 Excel +export const exportDismantlingDetail = async (params) => { + return await request.download({ url: `/mes/dismantling-detail/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/mes/dismantling-detail/get-import-template' }) +} \ No newline at end of file diff --git a/src/utils/dict.ts b/src/utils/dict.ts index a29a1fd4b..ab14d1b02 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -312,6 +312,10 @@ export enum DICT_TYPE { REWORK_STATUS='rework_status',//返工返修状态:待返修，返修中，返修完成 REWORK_REPLACE_FLAG = 'rework_replace_flag',//是否有替换件 DISMANTLING_BILL_TYPE = 'dismantling_bill_type',//工单类型 + DISMANTLING_MATERIAL_STATUS = 'dismantling_material_status',//报废拆解物料状态 + DISMANTLING_MATERIAL_HANDLE_STATUS = 'dismantling_material_handle_status',//报废拆解处理状态 + + SUPPLIERINVOICE_REQUEST_STATUS = 'supplierinvoice_request_status', //发票申请状态 SUPPLIERINVOICE_STATUS = 'supplierinvoice_status', //待开票审核状态 } diff --git a/src/views/mes/dismantlingMain/dismantlingMain.data.ts b/src/views/mes/dismantlingMain/dismantlingMain.data.ts index 9e09bf0bb..7de151710 100644 --- a/src/views/mes/dismantlingMain/dismantlingMain.data.ts +++ b/src/views/mes/dismantlingMain/dismantlingMain.data.ts @@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime' import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data"; import * as ItembasicApi from "@/api/wms/itembasic"; -// 表单校验 +// 主表单校验 export const DismantlingMainRules = reactive({ productionCode: [required], workbillType: [required], @@ -175,3 +175,182 @@ export const DismantlingMain = useCrudSchemas(reactive([ } } ])) + +export const DismantlingDetail = useCrudSchemas(reactive([ + { + label: '删除时间', + field: 'deleteTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail: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: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '状态', + field: 'status', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'Radio' + }, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail: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')] + } + }, + }, + { + label: '删除用户名', + field: 'deleter', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '位置ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '单据编码', + field: 'mainBiilno', + sort: 'custom', + isSearch: true, + isForm: false, + isTable: false, + table: { + width: 150, + fixed: 'right' + } + }, + { + label: '物料编码', + field: 'materialCode', + sort: 'custom', + isSearch: true, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchTitle: '物料编码', // 查询弹窗标题 + searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 + searchField: 'code', // 查询弹窗赋值字段 + searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'type', + action: 'in', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + value: 'BCP,CCP',//,SEMI] + isMainValue: false + }] + } + } + }, + { + label: '物料状态', + field: 'materialStauts', + sort: 'custom', + dictType: DICT_TYPE.DISMANTLING_MATERIAL_STATUS, + dictClass: 'string', + isSearch: true, + }, + { + label: '处理状态', + field: 'materialProcessstauts', + dictType: DICT_TYPE.DISMANTLING_MATERIAL_HANDLE_STATUS, + dictClass: 'string', + sort: 'custom', + isSearch: true, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + +// 子表单校验 +export const DismantlingDetailRules = reactive({ + materialCode: [required], + materialStauts: [required], + materialProcessstauts: [required], +}) diff --git a/src/views/mes/dismantlingMain/index.vue b/src/views/mes/dismantlingMain/index.vue index bf517c993..d617b45e1 100644 --- a/src/views/mes/dismantlingMain/index.vue +++ b/src/views/mes/dismantlingMain/index.vue @@ -28,7 +28,7 @@ v-model:sort="tableObject.sort" > @@ -51,7 +51,21 @@ /> - + @@ -59,8 +73,9 @@ diff --git a/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts index 176082762..f4a25613e 100644 --- a/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts +++ b/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts @@ -74,14 +74,70 @@ export const MesOrderMonthSub = useCrudSchemas(reactive([ } } }, + { + label: '计划开始日期', + field: 'planBegin', + sort: 'custom', + isSearch: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180, + fixed: 'left' + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '计划结束日期', + field: 'planEnd', + sort: 'custom', + isSearch: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180, + fixed: 'left' + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '状态', + field: 'status', + sort: 'custom', + isSearch: true, + isForm: false, + table: { + width: 100, + fixed: 'left' + }, + }, { label: '入库仓库编码', field: 'inStoreCode', sort: 'custom', isSearch: true, table: { - width: 140, - fixed: 'left' + width: 150 }, form: { // labelMessage: '信息提示说明！！！', @@ -108,20 +164,36 @@ export const MesOrderMonthSub = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - width: 120, - fixed: 'left' + width: 120 }, }, { - label: '状态', - field: 'status', + label: '实际开工日期', + field: 'realStart', sort: 'custom', isSearch: true, isForm: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 100, - fixed: 'left' + width: 180 + } + }, + { + label: '实际完工日期', + field: 'realFinish', + sort: 'custom', + isSearch: true, + isForm: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + table: { + width: 180 + } }, { label: '是否回冲', @@ -130,8 +202,7 @@ export const MesOrderMonthSub = useCrudSchemas(reactive([ isSearch: true, isForm: false, table: { - width: 120, - fixed: 'left' + width: 120 }, }, { @@ -198,78 +269,6 @@ export const MesOrderMonthSub = useCrudSchemas(reactive([ }, isForm: false }, - { - label: '计划开始日期', - field: 'planBegin', - sort: 'custom', - isSearch: true, - 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: 'planEnd', - sort: 'custom', - isSearch: true, - 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: 'realStart', - sort: 'custom', - isSearch: true, - isForm: false, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - } - }, - { - label: '实际完工日期', - field: 'realFinish', - sort: 'custom', - isSearch: true, - isForm: false, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - } - }, { label: '备注', field: 'remark', @@ -281,7 +280,7 @@ export const MesOrderMonthSub = useCrudSchemas(reactive([ field: 'action', isForm: false, table: { - width: 150, + width: 160, fixed: 'right' } } From a460dfcc1396aec26ae0bd201269c3eea347d121 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 10 Apr 2024 09:39:09 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionRecordMain/index.ts | 2 +- .../inspectionJob/inspectionJobMain.data.ts | 18 +++++++++++++ .../inspection/inspectionRecord/addForm.vue | 17 ++---------- .../inspectionRecordMain.data.ts | 27 +++++++++++++++++++ 4 files changed, 48 insertions(+), 16 deletions(-) diff --git a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts index db265c38d..aeb223f30 100644 --- a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts +++ b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts @@ -67,7 +67,7 @@ export const importTemplate = () => { export const publishInspectionRecordMain = async (data ) => { return await request.put({ url: `/qms/inspection-record-main/publish`, data }) } -//查询检验申请列表 +//查询包装列表 export const getInspectionRecordPackageList = async (id: number) => { return await request.get({ url: `/qms/inspection-record-package/list?masterId=` + id }) } \ No newline at end of file diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts index cfbacc86e..c9df5d35f 100644 --- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts @@ -539,6 +539,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -548,6 +551,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -557,6 +563,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -570,6 +579,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive([ }, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -579,6 +591,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -586,6 +601,9 @@ export const InspectionJobPackage = useCrudSchemas(reactive([ field: 'sampleAmount', sort: 'custom', isSearch: true, + table:{ + width:150 + } }, ])) //表单校验 diff --git a/src/views/qms/inspection/inspectionRecord/addForm.vue b/src/views/qms/inspection/inspectionRecord/addForm.vue index 3a30687dd..b3863abd0 100644 --- a/src/views/qms/inspection/inspectionRecord/addForm.vue +++ b/src/views/qms/inspection/inspectionRecord/addForm.vue @@ -41,21 +41,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { getCurrentInstance } from 'vue' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' -import * as InspectionJobDetailPageApi from '@/api/qms/inspectionJob/inspectionJobDetail' import { SearchTable } from '@/components/SearchTable' -import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data' -// import { InspectionTemplateMain } from '@/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data' -// import * as InspectionTemplateApi from '@/api/qms/inspectionTemplate' -// import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' -// import * as ItemBasicApi from '@/api/wms/itembasic' -import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程 -import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法 -import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法 -import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则 -import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则 -import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集 -import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集 -import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain' +import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain' const { proxy } = getCurrentInstance() @@ -145,7 +132,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any formType.value = type if (row) { data.value = JSON.parse(JSON.stringify(row)) - data.value.packageList = await InspectionJobMainApi.getInspectionJobPackageList(row.id) + data.value.packageList = await InspectionRecordMainApi.getInspectionRecordPackageList(row.id) data.value.packageList.forEach(item=>{ item.qualifiedAmount =0 item.noQualifiedAmount =0 diff --git a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts index c927a4210..c1d7e440c 100644 --- a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts +++ b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts @@ -573,6 +573,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -582,6 +585,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -595,6 +601,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ }, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -604,6 +613,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -613,6 +625,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -622,6 +637,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -631,6 +649,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -640,6 +661,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } }, { @@ -649,6 +673,9 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ isSearch: true, tableForm:{ disabled:true + }, + table:{ + width:150 } } ])) From 66070fa1787b8311887321120497690be8d06217 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 10 Apr 2024 09:50:33 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E5=A4=87=E6=B3=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=82=E5=88=97=E8=A1=A8=E7=AC=AC=E4=B8=80=E5=88=97=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionJob/inspectionJobMain.data.ts | 31 ++----------------- .../inspection/inspectionRecord/addForm.vue | 2 +- .../inspectionRecordMain.data.ts | 7 +++-- 3 files changed, 7 insertions(+), 33 deletions(-) diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts index c9df5d35f..0ddaca2b2 100644 --- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts @@ -30,7 +30,8 @@ export const InspectionJobMain = useCrudSchemas(reactive([ } }, table: { - width: 150 + width: 150, + fixed: 'left' } }, { @@ -276,34 +277,6 @@ export const InspectionJobMain = useCrudSchemas(reactive([ width: 150 } }, - { - label: '检验任务包装列表', - field: 'inspectionTaskPackageCode', - sort: 'custom', - isSearch: false, - form:{ - componentProps:{ - disabled:true - } - }, - table: { - width: 150 - } - }, - { - label: '检验任务工序列表', - field: 'inspectionTaskProcessCode', - sort: 'custom', - isSearch: false, - form:{ - componentProps:{ - disabled:true - } - }, - table: { - width: 150 - } - }, { label: '计划开始时间', field: 'planStartTime', diff --git a/src/views/qms/inspection/inspectionRecord/addForm.vue b/src/views/qms/inspection/inspectionRecord/addForm.vue index b3863abd0..6014f7e97 100644 --- a/src/views/qms/inspection/inspectionRecord/addForm.vue +++ b/src/views/qms/inspection/inspectionRecord/addForm.vue @@ -37,7 +37,7 @@ -