From 9327c1e5ba63ab62ad8ca1382d45155884ee8c53 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 15 May 2024 11:42:08 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=98=8E=E7=BB=86=EF=BC=8CSearchTable=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverRequestMain/index.vue | 3 +- .../deliverplan/deliverPlanMain/index.vue | 2 +- .../stockup/stockupMainRequest/index.vue | 2 +- .../productputawayRequestMain/index.vue | 4 +- .../productputawayRequestMain.data.ts | 10 +++- .../productredressRequestMain/index.vue | 2 +- .../productredressRequestMain.data.ts | 47 ++++++++++--------- .../sparereceiptRequestMain/index.vue | 40 +++++++++------- .../purchasePlanMain/index.vue | 9 +++- .../supplierdeliverBasicForm.vue | 1 - .../supplierdeliverRequestMain.data.ts | 2 +- .../supplierinvoiceRequestMain/index.vue | 1 + 12 files changed, 72 insertions(+), 51 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index e0345b511..3a6f4ac74 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -123,9 +123,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => DeliverRequestDetail.allSchemas.tableFormColumns.forEach(item => { tableFormKeys[item.field] = item.default ? item.default : '' }) - console.log('tableData.value',tableData.value) val.forEach(item=>{ - if(tableData.value.find(item1=>item1['id'] == item['id'])) return + if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow['uom'] = item['customerUom'] tableData.value.push(newRow) diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index d280216c7..9708efed8 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -127,7 +127,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if (type == 'tableForm') { if(formField == 'itemCode') { val.forEach(item=>{ - if(tableData.value.find(item1=>item1['id'] == item['id'])) return + if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow['uom'] = item['customerUom'] tableData.value.push(newRow) diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index 0797f4453..a62a60b87 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -127,7 +127,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // } if(formField == 'itemCode') { val.forEach(item=>{ - if(tableData.value.find(item1=>item1['id'] == item['id'])) return + if(tableData.value.find(item1=>item1['itemCode'] == item['code'])) return const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow['uom'] = item['uom'] newRow['itemCode'] = item['code'] diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue index 9aa2e429b..42db6d925 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue @@ -108,11 +108,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - if(tableData.value.find(item1=>item1['id'] == item['id'])) return val.forEach(item=>{ + if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode']&&item1['batch'] == item['batch']&&item1['packingNumber'] == item['packingNumber']&&item1['fromLocationCode'] == item['locationCode']&&item1['inventoryStatus'] == item['inventoryStatus'])) return const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow[formField] = item[searchField] - newRow['poLine'] = item['itemCode'] + newRow['itemCode'] = item['itemCode'] newRow['packingNumber'] = item['packingNumber'] newRow['containerNumber'] = item['containerNumber'] newRow['batch'] = item['batch'] diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts index 0638e6352..f03928c9f 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts @@ -462,7 +462,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePageByBusinessType, // 查询弹窗所需分页方法 + searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法 searchCondition: [{ key: 'businessType', value: businessTypeData.code, @@ -476,7 +476,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePageByBusinessType, // 查询弹窗所需分页方法 + searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法 searchCondition: [{ key: 'businessType', value: businessTypeData.code, @@ -533,6 +533,9 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: true + } }, { label: '包装数量', @@ -541,6 +544,9 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: true + } }, { label: '计量单位', diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index 6e88e7416..9d1383041 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -128,8 +128,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // 明细查询页赋值 row[formField] = val[0][searchField] if (formField == 'itemCode') { - if(tableData.value.find(item1=>item1['id'] == item['id'])) return val.forEach(item=>{ + if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode']&&item1['batch'] == item['batch']&&item1['packingNumber'] == item['packingNumber']&&item1['toLocationCode'] == item['locationCode']&&item1['inventoryStatus'] == item['inventoryStatus'])) return const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow['itemCode'] = item['itemCode'] newRow['qty'] = item['qty'] diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts index 4afaf03c7..ffa292018 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts @@ -309,7 +309,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive // }, { - label: '物料代码', + label: '物料代码1', field: 'itemCode', sort: 'custom', table: { @@ -317,31 +317,32 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive }, form: { // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物料代码', // 输入框占位文本 - searchField: 'itemCode', // 查询弹窗赋值字段 - searchTitle: '库存余额信息', // 查询弹窗标题 - searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'businessType', - value: businessTypeData.code, - action: '==', // 查询拼接条件 - isSearch: true, // 使用自定义拼接条件 - isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 - },{ - key: 'packingNumber', // 查询列表中字段 - value: '', // 指查询具体值 - action: 'isNotStr', // 查询拼接条件 - isSearch: true, // 使用自定义拼接条件 - isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 - }] - } + // componentProps: { + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + // searchField: 'itemCode', // 查询弹窗赋值字段 + // searchTitle: '库存余额信息', // 查询弹窗标题 + // searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 + // searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法 + // searchCondition: [{ + // key: 'businessType', + // value: businessTypeData.code, + // action: '==', // 查询拼接条件 + // isSearch: true, // 使用自定义拼接条件 + // isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 + // },{ + // key: 'packingNumber', // 查询列表中字段 + // value: '', // 指查询具体值 + // action: 'isNotStr', // 查询拼接条件 + // isSearch: true, // 使用自定义拼接条件 + // isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 + // }] + // } }, tableForm:{ + disabled: true, multiple:true, - isInpuFocusShow: true, + // isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index a607fca8c..fc4993200 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -112,6 +112,7 @@ diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts new file mode 100644 index 000000000..01a9d1b4a --- /dev/null +++ b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts @@ -0,0 +1,119 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const QadProductionPlanMainRules = reactive({ + workshop: [required], + woNumber: [required], + woLine: [required], +}) + +export const QadProductionPlanMain = useCrudSchemas(reactive([ + { + label: '顺序', + field: 'displayOrder', + sort: 'custom', + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + }, + { + label: '车间', + field: 'workshop', + sort: 'custom', + isSearch: true, + }, + { + label: '生产线', + field: 'productionLine', + sort: 'custom', + isSearch: true, + }, + { + label: '班次', + field: 'shift', + sort: 'custom', + isSearch: true, + }, + { + label: '班组', + field: 'team', + sort: 'custom', + }, + { + label: '计划日期', + field: 'planDate', + sort: 'custom', + formatter: dateFormatter, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '明细列表', + field: 'details', + sort: 'custom', + }, + { + label: '计划类型', + field: 'planType', + sort: 'custom', + form: { + component: 'SelectV2' + }, + }, + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + form: { + component: 'SelectV2' + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isForm: false, + }, + { + label: '状态', + field: 'status', + sort: 'custom', + isForm: false, + }, + { + label: '订单号', + field: 'woNumber', + sort: 'custom', + }, + { + label: '订单行', + field: 'woLine', + sort: 'custom', + }, + // { + // label: '操作', + // field: 'action', + // isForm: false, + // table: { + // width: 150, + // fixed: 'right' + // } + // } +])) From 2c62fd004c58b6e4f752facce1ed76cdb6c73b20 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 15 May 2024 15:35:41 +0800 Subject: [PATCH 09/20] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=E4=B8=BB?= =?UTF-8?q?=E8=A6=81=E9=83=A8=E4=BB=B6=20=E6=96=87=E6=A1=A3=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=20=E6=95=85=E9=9A=9C=E7=B1=BB=E5=9E=8B=20=E6=95=85?= =?UTF-8?q?=E9=9A=9C=E5=8E=9F=E5=9B=A0=20=E5=90=AF=E7=94=A8=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E6=8C=89=E9=92=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/basicFaultCause/index.ts | 8 +- src/api/eam/basicFaultType/index.ts | 8 +- src/api/eam/basicInspectionOption/index.ts | 64 ++++ src/api/eam/documentType/index.ts | 8 +- src/api/eam/equipmentMainPart/index.ts | 8 +- .../basicFaultCause/basicFaultCause.data.ts | 4 +- src/views/eam/basicFaultCause/index.vue | 57 +++- .../eam/basicFaultType/basicFaultType.data.ts | 4 +- src/views/eam/basicFaultType/index.vue | 58 +++- .../basicInspectionOption.data.ts | 168 ++++++++++ src/views/eam/basicInspectionOption/index.vue | 290 ++++++++++++++++++ .../eam/documentType/documentType.data.ts | 4 +- src/views/eam/documentType/index.vue | 57 +++- .../equipmentMainPart.data.ts | 4 +- src/views/eam/equipmentMainPart/index.vue | 62 +++- 15 files changed, 771 insertions(+), 33 deletions(-) create mode 100644 src/api/eam/basicInspectionOption/index.ts create mode 100644 src/views/eam/basicInspectionOption/basicInspectionOption.data.ts create mode 100644 src/views/eam/basicInspectionOption/index.vue diff --git a/src/api/eam/basicFaultCause/index.ts b/src/api/eam/basicFaultCause/index.ts index 391442089..ff5aed0e5 100644 --- a/src/api/eam/basicFaultCause/index.ts +++ b/src/api/eam/basicFaultCause/index.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' +import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart"; export interface BasicFaultCauseVO { id: number @@ -54,4 +55,9 @@ export const exportBasicFaultCause = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/basic-fault-cause/get-import-template' }) -} \ No newline at end of file +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: EquipmentMainPartVO) => { + return await request.post({ url: `/eam/basic-fault-cause/ables` , data }) +} diff --git a/src/api/eam/basicFaultType/index.ts b/src/api/eam/basicFaultType/index.ts index 727094608..899b82ec4 100644 --- a/src/api/eam/basicFaultType/index.ts +++ b/src/api/eam/basicFaultType/index.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' +import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart"; export interface BasicFaultTypeVO { id: number @@ -53,4 +54,9 @@ export const exportBasicFaultType = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/basic-fault-type/get-import-template' }) -} \ No newline at end of file +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: EquipmentMainPartVO) => { + return await request.post({ url: `/eam/basic-fault-type/ables` , data }) +} diff --git a/src/api/eam/basicInspectionOption/index.ts b/src/api/eam/basicInspectionOption/index.ts new file mode 100644 index 000000000..c41812cbe --- /dev/null +++ b/src/api/eam/basicInspectionOption/index.ts @@ -0,0 +1,64 @@ +import request from '@/config/axios' +import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart"; + +export interface BasicInspectionOptionVO { + id: number + code: string + name: string + describing: string + isUpdated: boolean + type: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询巡检方案列表 +export const getBasicInspectionOptionPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/basic-inspection-option/senior', data }) + } else { + return await request.get({ url: `/eam/basic-inspection-option/page`, params }) + } +} + +// 查询巡检方案详情 +export const getBasicInspectionOption = async (id: number) => { + return await request.get({ url: `/eam/basic-inspection-option/get?id=` + id }) +} + +// 新增巡检方案 +export const createBasicInspectionOption = async (data: BasicInspectionOptionVO) => { + return await request.post({ url: `/eam/basic-inspection-option/create`, data }) +} + +// 修改巡检方案 +export const updateBasicInspectionOption = async (data: BasicInspectionOptionVO) => { + return await request.put({ url: `/eam/basic-inspection-option/update`, data }) +} + +// 删除巡检方案 +export const deleteBasicInspectionOption = async (id: number) => { + return await request.delete({ url: `/eam/basic-inspection-option/delete?id=` + id }) +} + +// 导出巡检方案 Excel +export const exportBasicInspectionOption = async (params) => { + return await request.download({ url: `/eam/basic-inspection-option/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/basic-inspection-option/get-import-template' }) +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: EquipmentMainPartVO) => { + return await request.post({ url: `/eam/basic-inspection-option/ables` , data }) +} diff --git a/src/api/eam/documentType/index.ts b/src/api/eam/documentType/index.ts index 4d73e1d21..0ab30af39 100644 --- a/src/api/eam/documentType/index.ts +++ b/src/api/eam/documentType/index.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' +import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart"; export interface DocumentTypeVO { id: number @@ -53,4 +54,9 @@ export const exportDocumentType = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/document-type/get-import-template' }) -} \ No newline at end of file +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: EquipmentMainPartVO) => { + return await request.post({ url: `/eam/document-type/ables` , data }) +} diff --git a/src/api/eam/equipmentMainPart/index.ts b/src/api/eam/equipmentMainPart/index.ts index 482c17209..a5d7acdd2 100644 --- a/src/api/eam/equipmentMainPart/index.ts +++ b/src/api/eam/equipmentMainPart/index.ts @@ -37,6 +37,7 @@ export const createEquipmentMainPart = async (data: EquipmentMainPartVO) => { // 修改主要部件 export const updateEquipmentMainPart = async (data: EquipmentMainPartVO) => { + console.log(data) return await request.put({ url: `/eam/equipment-main-part/update`, data }) } @@ -53,4 +54,9 @@ export const exportEquipmentMainPart = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/equipment-main-part/get-import-template' }) -} \ No newline at end of file +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: EquipmentMainPartVO) => { + return await request.post({ url: `/eam/equipment-main-part/ables` , data }) +} diff --git a/src/views/eam/basicFaultCause/basicFaultCause.data.ts b/src/views/eam/basicFaultCause/basicFaultCause.data.ts index 7f4a449da..3704d71a1 100644 --- a/src/views/eam/basicFaultCause/basicFaultCause.data.ts +++ b/src/views/eam/basicFaultCause/basicFaultCause.data.ts @@ -94,10 +94,10 @@ export const BasicFaultCause = useCrudSchemas(reactive([ sort: 'custom', form: { component: 'Switch', - value: 'TURE', + value: 'TRUE', componentProps: { inactiveValue: 'FALSE', - activeValue: 'TURE' + activeValue: 'TRUE' } }, }, diff --git a/src/views/eam/basicFaultCause/index.vue b/src/views/eam/basicFaultCause/index.vue index 856520c70..b2157ca64 100644 --- a/src/views/eam/basicFaultCause/index.vue +++ b/src/views/eam/basicFaultCause/index.vue @@ -33,7 +33,7 @@ @@ -131,11 +131,23 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row,val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'eam:basicFaultCause:update'}), // 编辑 - //defaultButtons.mainListDeleteBtn({hasPermi:'eam:basicFaultCause:delete'}), // 删除 -] +const butttondata = (row) => { + return [ + defaultButtons.mainListEditBtn({hasPermi:'eam:basicFaultCause:update'}), // 编辑 + //defaultButtons.mainListDeleteBtn({hasPermi:'eam:basicInspectionOption:delete'}), // 删除 + defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:basicFaultCause:update'}), + defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:basicFaultCause:update'}), + ] +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -143,6 +155,10 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + }else if (val == 'enable') { + handleEnable(row.id) + }else if (val == 'disable') { + handleDisable(row.id) } } @@ -195,6 +211,37 @@ const handleDelete = async (id: number) => { } catch {} } +/** 启用 */ +const handleEnable = async (id: number) => { + try { + const params = ref({ + id: '', + available:'', + }) + params.value.id = id + params.value.available = 'TRUE' + await BasicFaultCauseApi.updateEnableCode(params.value) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} +/** 禁用 */ +const handleDisable = async (id: number) => { + try { + const params = ref({ + id: '', + available:'', + }) + params.value.id = id + params.value.available = 'FALSE' + await BasicFaultCauseApi.updateEnableCode(params.value) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 const handleExport = async () => { diff --git a/src/views/eam/basicFaultType/basicFaultType.data.ts b/src/views/eam/basicFaultType/basicFaultType.data.ts index 97d3471d9..4a2802690 100644 --- a/src/views/eam/basicFaultType/basicFaultType.data.ts +++ b/src/views/eam/basicFaultType/basicFaultType.data.ts @@ -81,10 +81,10 @@ export const BasicFaultType = useCrudSchemas(reactive([ sort: 'custom', form: { component: 'Switch', - value: 'TURE', + value: 'TRUE', componentProps: { inactiveValue: 'FALSE', - activeValue: 'TURE' + activeValue: 'TRUE' } }, }, diff --git a/src/views/eam/basicFaultType/index.vue b/src/views/eam/basicFaultType/index.vue index f45fe0e45..8296e6fa9 100644 --- a/src/views/eam/basicFaultType/index.vue +++ b/src/views/eam/basicFaultType/index.vue @@ -33,7 +33,7 @@ @@ -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 * as BasicInspectionOptionApi from "@/api/eam/basicInspectionOption"; defineOptions({ name: 'BasicFaultType' }) @@ -131,11 +132,23 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row,val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'eam:basicFaultType:update'}), // 编辑 - //defaultButtons.mainListDeleteBtn({hasPermi:'eam:basicFaultType:delete'}), // 删除 -] +const butttondata = (row) => { + return [ + defaultButtons.mainListEditBtn({hasPermi:'eam:basicFaultType:update'}), // 编辑 + //defaultButtons.mainListDeleteBtn({hasPermi:'eam:basicInspectionOption:delete'}), // 删除 + defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:basicFaultType:update'}), + defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:basicFaultType:update'}), + ] +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -143,6 +156,10 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + }else if (val == 'enable') { + handleEnable(row.id) + }else if (val == 'disable') { + handleDisable(row.id) } } @@ -195,6 +212,37 @@ const handleDelete = async (id: number) => { } catch {} } +/** 启用 */ +const handleEnable = async (id: number) => { + try { + const params = ref({ + id: '', + available:'', + }) + params.value.id = id + params.value.available = 'TRUE' + await BasicFaultTypeApi.updateEnableCode(params.value) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} +/** 禁用 */ +const handleDisable = async (id: number) => { + try { + const params = ref({ + id: '', + available:'', + }) + params.value.id = id + params.value.available = 'FALSE' + await BasicFaultTypeApi.updateEnableCode(params.value) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 const handleExport = async () => { diff --git a/src/views/eam/basicInspectionOption/basicInspectionOption.data.ts b/src/views/eam/basicInspectionOption/basicInspectionOption.data.ts new file mode 100644 index 000000000..6e7fe83bf --- /dev/null +++ b/src/views/eam/basicInspectionOption/basicInspectionOption.data.ts @@ -0,0 +1,168 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const BasicInspectionOptionRules = reactive({ + code: [required], + name: [required], + type: [required], +}) + +export const BasicInspectionOption = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '编号', + field: 'code', + sort: 'custom', + isSearch: true, + }, + { + label: '方案名称', + field: 'name', + sort: 'custom', + isSearch: true, + }, + { + label: '描述', + field: 'describing', + sort: 'custom', + isSearch: true, + }, + { + label: '项是否可修改', + field: 'isUpdated', + sort: 'custom', + isSearch: true, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + }, + { + label: '来源于类型配置', + field: 'type', + sort: 'custom', + isSearch: true, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + 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')] + } + }, + isForm: false, + }, + { + label: '部门id', + field: 'departmentCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + }, + { + label: '删除时间', + field: 'deletionTime', + 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: '删除人id', + field: 'deleterId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/eam/basicInspectionOption/index.vue b/src/views/eam/basicInspectionOption/index.vue new file mode 100644 index 000000000..c58bf8890 --- /dev/null +++ b/src/views/eam/basicInspectionOption/index.vue @@ -0,0 +1,290 @@ + + + diff --git a/src/views/eam/documentType/documentType.data.ts b/src/views/eam/documentType/documentType.data.ts index 1ec63a019..38605efc5 100644 --- a/src/views/eam/documentType/documentType.data.ts +++ b/src/views/eam/documentType/documentType.data.ts @@ -83,10 +83,10 @@ export const DocumentType = useCrudSchemas(reactive([ sort: 'custom', form: { component: 'Switch', - value: 'TURE', + value: 'TRUE', componentProps: { inactiveValue: 'FALSE', - activeValue: 'TURE' + activeValue: 'TRUE' } }, }, diff --git a/src/views/eam/documentType/index.vue b/src/views/eam/documentType/index.vue index b244a4a6e..0f46e6cf1 100644 --- a/src/views/eam/documentType/index.vue +++ b/src/views/eam/documentType/index.vue @@ -33,7 +33,7 @@ @@ -131,11 +131,23 @@ const buttonBaseClick = (val, item) => { } } +const isShowMainButton = (row,val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'eam:documentType:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'eam:documentType:delete'}), // 删除 -] +const butttondata = (row) => { + return [ + defaultButtons.mainListEditBtn({hasPermi:'eam:documentType:update'}), // 编辑 + //defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMainPart:delete'}), // 删除 + defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:documentType:update'}), + defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:documentType:update'}), + ] +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -143,6 +155,10 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + }else if (val == 'enable') { + handleEnable(row.id) + }else if (val == 'disable') { + handleDisable(row.id) } } @@ -211,6 +227,37 @@ const handleExport = async () => { } } +/** 启用 */ +const handleEnable = async (id: number) => { + try { + const params = ref({ + id: '', + available:'', + }) + params.value.id = id + params.value.available = 'TRUE' + await DocumentTypeApi.updateEnableCode(params.value) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} +/** 禁用 */ +const handleDisable = async (id: number) => { + try { + const params = ref({ + id: '', + available:'', + }) + params.value.id = id + params.value.available = 'FALSE' + await DocumentTypeApi.updateEnableCode(params.value) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + /** 导入 */ const importFormRef = ref() const handleImport = () => { diff --git a/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts b/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts index 8937ab8ef..efba49dec 100644 --- a/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts +++ b/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts @@ -83,10 +83,10 @@ export const EquipmentMainPart = useCrudSchemas(reactive([ isSearch: true, form: { component: 'Switch', - value: 'TURE', + value: 'TRUE', componentProps: { inactiveValue: 'FALSE', - activeValue: 'TURE' + activeValue: 'TRUE' } }, }, diff --git a/src/views/eam/equipmentMainPart/index.vue b/src/views/eam/equipmentMainPart/index.vue index 97cd0bdaf..6af6d2835 100644 --- a/src/views/eam/equipmentMainPart/index.vue +++ b/src/views/eam/equipmentMainPart/index.vue @@ -33,7 +33,7 @@ @@ -131,11 +131,23 @@ const buttonBaseClick = (val, item) => { } } -// 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentMainPart:update'}), // 编辑 - //defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMainPart:delete'}), // 删除 -] +const isShowMainButton = (row,val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + +const butttondata = (row) => { + return [ + defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentMainPart:update'}), // 编辑 + //defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMainPart:delete'}), // 删除 + defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:equipmentMainPart:update'}), + defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:equipmentMainPart:update'}), + ] +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -143,6 +155,10 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + }else if (val == 'enable') { + handleEnable(row.id) + }else if (val == 'disable') { + handleDisable(row.id) } } @@ -195,6 +211,40 @@ const handleDelete = async (id: number) => { } catch {} } + + + +/** 启用 */ +const handleEnable = async (id: number) => { + try { + const params = ref({ + id: '', + available:'', + }) + params.value.id = id + params.value.available = 'TRUE' + await EquipmentMainPartApi.updateEnableCode(params.value) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} +/** 禁用 */ +const handleDisable = async (id: number) => { + try { + const params = ref({ + id: '', + available:'', + }) + params.value.id = id + params.value.available = 'FALSE' + await EquipmentMainPartApi.updateEnableCode(params.value) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 const handleExport = async () => { From b2b27ba9b8a4cada0d05c5fb343c5dd56e005f55 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 15 May 2024 15:42:07 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.hella13 | 3 +++ .env.hella14 | 3 +++ .env.hella15 | 3 +++ .env.hella16 | 3 +++ .env.hella8 | 4 ++++ .env.hella9 | 3 +++ 6 files changed, 19 insertions(+) diff --git a/.env.hella13 b/.env.hella13 index 9b9e1300c..b60b2be7c 100644 --- a/.env.hella13 +++ b/.env.hella13 @@ -35,3 +35,6 @@ VITE_INTERFACE_URL='http://172.21.32.13:90/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' + +# 租户配置 +VITE_TENANT='["长春"]' diff --git a/.env.hella14 b/.env.hella14 index 9e15dcdd5..4d29e7b41 100644 --- a/.env.hella14 +++ b/.env.hella14 @@ -35,3 +35,6 @@ VITE_INTERFACE_URL='http://172.21.32.14:90/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.21.32.14:90' + +# 租户配置 +VITE_TENANT='["长春"]' diff --git a/.env.hella15 b/.env.hella15 index 30eac259b..dc2a813d1 100644 --- a/.env.hella15 +++ b/.env.hella15 @@ -35,3 +35,6 @@ VITE_INTERFACE_URL='http://172.21.32.15:90/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.21.32.15:90' + +# 租户配置 +VITE_TENANT='["长春"]' diff --git a/.env.hella16 b/.env.hella16 index 459c68a41..dd8d228a8 100644 --- a/.env.hella16 +++ b/.env.hella16 @@ -35,3 +35,6 @@ VITE_INTERFACE_URL='http://172.21.32.16:90/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.21.32.16:90' + +# 租户配置 +VITE_TENANT='["长春"]' diff --git a/.env.hella8 b/.env.hella8 index 844c22c0e..d1d914dac 100644 --- a/.env.hella8 +++ b/.env.hella8 @@ -35,3 +35,7 @@ VITE_INTERFACE_URL='http://172.22.32.8:90/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.22.32.8:90' + + +# 租户配置 +VITE_TENANT='["成都"]' \ No newline at end of file diff --git a/.env.hella9 b/.env.hella9 index 308a2ffd2..86853d4ef 100644 --- a/.env.hella9 +++ b/.env.hella9 @@ -35,3 +35,6 @@ VITE_INTERFACE_URL='http://172.22.32.9:90/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.22.32.9:90' + +# 租户配置 +VITE_TENANT='["成都"]' \ No newline at end of file From 4cc74381fc21fc66f9270e685688691da752f122 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 15 May 2024 15:48:49 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f4123a4e8..74eef9397 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## dev发布2024-05-15-003 +## dev发布2024-05-15-004 **xxxx.data.ts 文件配置说明** **form表单查询弹窗配置** form: { From fd4c1643fe8c754a0bbb8e68f1a282b211b099cf Mon Sep 17 00:00:00 2001 From: zhousq Date: Wed, 15 May 2024 16:47:55 +0800 Subject: [PATCH 12/20] =?UTF-8?q?2024-05-15=20=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E6=8E=92=E7=8F=AD=E6=97=A5=E5=8E=86-=E5=8D=95=E6=97=A5?= =?UTF-8?q?=E6=8E=92=E7=8F=AD=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=E4=B8=8D?= =?UTF-8?q?=E5=A5=BD=E7=94=A8bug=20=EF=BC=9B=E5=88=A0=E9=99=A4=E6=8E=92?= =?UTF-8?q?=E7=8F=AD=E6=97=A5=E5=8E=86=E6=97=A0=E6=95=88=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../holidayCalendar/holidayCalendar.data.ts | 179 ------------------ src/views/mes/holidayCalendar/index.vue | 75 -------- src/views/mes/jobcalendar/index.vue | 8 - src/views/mes/workcalendar/index.vue | 6 +- 4 files changed, 5 insertions(+), 263 deletions(-) delete mode 100644 src/views/mes/holidayCalendar/holidayCalendar.data.ts delete mode 100644 src/views/mes/holidayCalendar/index.vue delete mode 100644 src/views/mes/jobcalendar/index.vue diff --git a/src/views/mes/holidayCalendar/holidayCalendar.data.ts b/src/views/mes/holidayCalendar/holidayCalendar.data.ts deleted file mode 100644 index 6094de858..000000000 --- a/src/views/mes/holidayCalendar/holidayCalendar.data.ts +++ /dev/null @@ -1,179 +0,0 @@ -import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' - -// 表单校验 -export const HolidayCalendarRules = reactive({ - endTime: [required], - concurrencyStamp: [required], -}) - -export const HolidayCalendar = useCrudSchemas(reactive([ - { - label: 'ID', - field: 'id', - sort: 'custom', - isForm: false, - }, - { - label: '日期', - field: 'holidayDate', - sort: 'custom', - formatter: dateFormatter, - 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')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - }, - { - label: '结束时间', - field: 'endTime', - sort: 'custom', - formatter: dateFormatter, - 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')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - }, - { - label: '备用字段一', - field: 'textOne', - sort: 'custom', - isSearch: true, - }, - { - label: '备用字段二', - field: 'textTwo', - sort: 'custom', - isSearch: true, - }, - { - label: '备用字段三', - field: 'textThree', - sort: 'custom', - isSearch: true, - }, - { - label: '备用字段四', - field: 'textFour', - sort: 'custom', - isSearch: true, - }, - { - label: '备用字段五', - field: 'textFive', - sort: 'custom', - isSearch: true, - }, - { - label: '删除时间', - field: 'deleteTime', - sort: 'custom', - formatter: dateFormatter, - 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')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - }, - { - label: '状态', - field: 'status', - sort: 'custom', - isSearch: true, - form: { - component: 'Radio' - }, - }, - { - label: '并发乐观锁', - field: 'concurrencyStamp', - sort: 'custom', - isSearch: true, - form: { - component: 'InputNumber', - value: 0 - }, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - isSearch: true, - }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - 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')] - } - }, - isForm: false, - }, - { - label: '删除用户名', - field: 'deleter', - sort: 'custom', - isSearch: true, - }, - { - label: '位置ID', - field: 'siteId', - sort: 'custom', - isSearch: true, - form: { - component: 'InputNumber', - value: 0 - }, - }, - { - label: '操作', - field: 'action', - isForm: false, - table: { - width: 150, - fixed: 'right' - } - } -])) diff --git a/src/views/mes/holidayCalendar/index.vue b/src/views/mes/holidayCalendar/index.vue deleted file mode 100644 index 21eeb6ee8..000000000 --- a/src/views/mes/holidayCalendar/index.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/mes/jobcalendar/index.vue b/src/views/mes/jobcalendar/index.vue deleted file mode 100644 index acd7a2a6c..000000000 --- a/src/views/mes/jobcalendar/index.vue +++ /dev/null @@ -1,8 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/mes/workcalendar/index.vue b/src/views/mes/workcalendar/index.vue index 4876ec101..16c054af5 100644 --- a/src/views/mes/workcalendar/index.vue +++ b/src/views/mes/workcalendar/index.vue @@ -238,7 +238,7 @@
- 取 消 + 取 消 保存
@@ -661,6 +661,10 @@ const batchAddWork = () => { const handleBatchClose = () => { batchAddDrawer.value = false } +const handleAddClose = () => { + drawer.value = false +} + const savePlan = async (workList) => { await workCalendarApi.createBatch(workList) //await workCalendarApi.createObj(workList); From e6593bf2a69150daa66f44e329fba4decb166254 Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 15 May 2024 16:48:58 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=80=80=E6=96=99=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E7=A9=BA?= =?UTF-8?q?=E7=99=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relegateRequest/relegateRequest.data.ts | 1 + .../productionreturnRequestMain/index.vue | 75 ++++++++++++++++--- .../productionreturnRequestMain.data.ts | 54 +++++++++++++ .../inventorymoveRequestMain/index.vue | 12 +-- 4 files changed, 127 insertions(+), 15 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts b/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts index d5dee49f8..de2becfec 100644 --- a/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts @@ -20,6 +20,7 @@ export const RelegateRequest = useCrudSchemas(reactive([ field: 'number', sort: 'custom', isSearch: true, + isForm:false, }, { label: '物料代码', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 299e34fef..ff157a819 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -70,6 +70,7 @@ :apiDelete="ProductionreturnRequestDetailApi.deleteProductionreturnRequestDetail" @searchTableSuccessDetail="searchTableSuccessDetail" @detailOpenForm="detailOpenForm" + :detailValidate="detailValidate" /> @@ -90,13 +91,14 @@ - + + + + From d7e18a69b75ec08dd3d477d1e7eec4dad37907d1 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 15 May 2024 17:15:04 +0800 Subject: [PATCH 17/20] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=E4=BF=9D?= =?UTF-8?q?=E5=85=BB=E6=96=B9=E6=A1=88=20=E5=89=8D=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index.ts | 0 src/api/eam/basicMaintenanceOption/index.ts | 64 ++++ .../basicDocumentType.data.ts} | 0 .../index.vue | 4 +- .../basicMaintenanceOption.data.ts | 171 ++++++++++ .../eam/basicMaintenanceOption/index.vue | 291 ++++++++++++++++++ 6 files changed, 528 insertions(+), 2 deletions(-) rename src/api/eam/{documentType => basicDocumentType}/index.ts (100%) create mode 100644 src/api/eam/basicMaintenanceOption/index.ts rename src/views/eam/{documentType/documentType.data.ts => basicDocumentType/basicDocumentType.data.ts} (100%) rename src/views/eam/{documentType => basicDocumentType}/index.vue (98%) create mode 100644 src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts create mode 100644 src/views/eam/basicMaintenanceOption/index.vue diff --git a/src/api/eam/documentType/index.ts b/src/api/eam/basicDocumentType/index.ts similarity index 100% rename from src/api/eam/documentType/index.ts rename to src/api/eam/basicDocumentType/index.ts diff --git a/src/api/eam/basicMaintenanceOption/index.ts b/src/api/eam/basicMaintenanceOption/index.ts new file mode 100644 index 000000000..0d95570c6 --- /dev/null +++ b/src/api/eam/basicMaintenanceOption/index.ts @@ -0,0 +1,64 @@ +import request from '@/config/axios' +import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart"; + +export interface BasicMaintenanceOptionVO { + id: number + code: string + name: string + describing: string + isUpdated: boolean + type: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询保养方案列表 +export const getBasicMaintenanceOptionPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/basic-maintenance-option/senior', data }) + } else { + return await request.get({ url: `/eam/basic-maintenance-option/page`, params }) + } +} + +// 查询保养方案详情 +export const getBasicMaintenanceOption = async (id: number) => { + return await request.get({ url: `/eam/basic-maintenance-option/get?id=` + id }) +} + +// 新增保养方案 +export const createBasicMaintenanceOption = async (data: BasicMaintenanceOptionVO) => { + return await request.post({ url: `/eam/basic-maintenance-option/create`, data }) +} + +// 修改保养方案 +export const updateBasicMaintenanceOption = async (data: BasicMaintenanceOptionVO) => { + return await request.put({ url: `/eam/basic-maintenance-option/update`, data }) +} + +// 删除保养方案 +export const deleteBasicMaintenanceOption = async (id: number) => { + return await request.delete({ url: `/eam/basic-maintenance-option/delete?id=` + id }) +} + +// 导出保养方案 Excel +export const exportBasicMaintenanceOption = async (params) => { + return await request.download({ url: `/eam/basic-maintenance-option/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/basic-maintenance-option/get-import-template' }) +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: EquipmentMainPartVO) => { + return await request.post({ url: `/eam/basic-maintenance-option/ables` , data }) +} diff --git a/src/views/eam/documentType/documentType.data.ts b/src/views/eam/basicDocumentType/basicDocumentType.data.ts similarity index 100% rename from src/views/eam/documentType/documentType.data.ts rename to src/views/eam/basicDocumentType/basicDocumentType.data.ts diff --git a/src/views/eam/documentType/index.vue b/src/views/eam/basicDocumentType/index.vue similarity index 98% rename from src/views/eam/documentType/index.vue rename to src/views/eam/basicDocumentType/index.vue index 0f46e6cf1..50e79ca47 100644 --- a/src/views/eam/documentType/index.vue +++ b/src/views/eam/basicDocumentType/index.vue @@ -59,8 +59,8 @@ From c11b2e78d82e5cd7d922f7cf9c09e5a4a2b32ea4 Mon Sep 17 00:00:00 2001 From: zhousq Date: Wed, 15 May 2024 17:26:43 +0800 Subject: [PATCH 18/20] =?UTF-8?q?2024-05-15=20=E8=AE=A1=E5=88=92=E6=8E=92?= =?UTF-8?q?=E4=BA=A7=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/orderDay/orderDay.data.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts index ab6b2b65d..43bed9d1e 100644 --- a/src/views/mes/orderDay/orderDay.data.ts +++ b/src/views/mes/orderDay/orderDay.data.ts @@ -273,6 +273,9 @@ export const OrderDay = useCrudSchemas(reactive([ valueFormat: 'YYYY-MM-DD', } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -296,6 +299,9 @@ export const OrderDay = useCrudSchemas(reactive([ timeFormat:"HH:mm" } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, }, { label: '结束时间', @@ -312,6 +318,9 @@ export const OrderDay = useCrudSchemas(reactive([ timeFormat:"HH:mm" } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, }, { label: '生产模式', @@ -339,6 +348,9 @@ export const OrderDay = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, isForm: false, }, { From dd8a23be4b1745bb3dace59ef2ca651e244db99f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 15 May 2024 17:27:38 +0800 Subject: [PATCH 19/20] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 27 ++++++------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 88e5dc8d3..1a9f11a80 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -357,7 +357,6 @@ allSamplePieceSize.value = 0//打开时候归0 if (row) { data.value = JSON.parse(JSON.stringify(row)) - // console.log(data.value)// 发起承接 // await InspectionJobMainApi.acceptInspectionJobMain(row.id) let list = [] list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id) @@ -421,7 +420,6 @@ rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = false } }) - console.log(22, allSamplePieceSize.value) data.value.subList = list /** 设置采样数量，默认第一个包装采样数量<总数量，显示数量字段，第二个包装和剩下的总数量对比，以此类推， @@ -526,12 +524,10 @@ quantifyQuantifyCode: '' } }) - console.log(data.value.subList) editableTabsValue.value = newTabName dialogVisibleName.value = false } else { - console.log('error submit!') return false } }) @@ -559,7 +555,6 @@ // 传递给父类 const emit = defineEmits(['submitForm', 'searchTableSuccess']) const validateForm = (formRef) => { - // console.log(TableBaseForm_Ref.value) let _lists = formRef?.map((v) => v.validate()) return Promise.all(_lists) .then(() => { @@ -572,7 +567,6 @@ const tableFormRef = ref() const submitForm = async () => { try { - console.log(data.value.subList) const elForm = unref(formMainRef)?.getElFormRef() // 校验表单 if (!elForm) return @@ -580,7 +574,6 @@ if (!valid) return // 校验包装列表 - console.log(11, data.value.packageList) if (data.value.packageList?.length > 0) { const validateForm1 = await tableFormRef.value.validateForm() if (!validateForm1) return @@ -611,11 +604,14 @@ let numberList = []//判断合格数量和不合格数量之和是否等于主表数量 let parseFloatList = []//判断合格数量和不合格数量是否是整数 data.value.subList.forEach((item, index) => { + + console.log("woxianlai") + console.log(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) { arrBol.push( item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some( (cur, key) => { - return !cur.qualifiedQuantity || !cur.unqualifiedQuantity + return cur.qualifiedQuantity==='' || cur.unqualifiedQuantity==='' } ) ) @@ -655,15 +651,14 @@ numberList.push( item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some( (cur, key) => { - console.log(12, cur.qualifiedQuantity) - console.log(13, cur.unqualifiedQuantity) - console.log(14, item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) return parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) } ) ) } }) + console.log("wolaile") + console.log(arrBol) let isEmpty1 = arrBol.some(item => item == true) let isEmptyNumberList = numberList.some(item => item == true) let isParseFloat = parseFloatList.some(item => item == true) @@ -691,13 +686,11 @@ emit('submitForm', formType.value, data.value) } } catch { - console.log(111) } } const staging = async () => { try { - console.log(data.value.subList) const elForm = unref(formMainRef)?.getElFormRef() // 校验表单 if (!elForm) return @@ -705,7 +698,6 @@ if (!valid) return // 校验包装列表 - console.log(11, data.value.packageList) if (data.value.packageList?.length > 0) { const validateForm1 = await tableFormRef.value.validateForm() if (!validateForm1) return @@ -780,9 +772,6 @@ numberList.push( item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some( (cur, key) => { - console.log(12, cur.qualifiedQuantity) - console.log(13, cur.unqualifiedQuantity) - console.log(14, item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) return parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) } ) @@ -811,7 +800,6 @@ await InspectionJobMainApi.stagingInspectionJobMain(data.value); message.success("暂存成功") } catch { - console.log(111) } } @@ -828,7 +816,6 @@ } // 选择特征类型 const changeFeatureType = (e) => { - console.log(e) // if (e) { // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyQuantifyCode'][0].required = true // } else { @@ -986,12 +973,10 @@ } ] } - console.log(222, item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) } // 选择选定级 const changeQualitativeCode = (e, item, cur) => { let obj = item.selectedProjectRespVOList.find((cur) => cur.dictionaryValue == e) - console.log(obj) cur.defectLevel = obj.defectLevel cur.estimateCode = obj.estimateCode } From 9b7bb68a3d87948a1b6aa186e8520630a48c3f67 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 15 May 2024 17:30:10 +0800 Subject: [PATCH 20/20] =?UTF-8?q?16=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.hella16 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.hella16 b/.env.hella16 index dd8d228a8..9672dcd3e 100644 --- a/.env.hella16 +++ b/.env.hella16 @@ -37,4 +37,4 @@ VITE_INTERFACE_URL='http://172.21.32.16:90/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://172.21.32.16:90' # 租户配置 -VITE_TENANT='["长春"]' +VITE_TENANT='["长春","成都"]'