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 01/26] =?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 02/26] =?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='["长春","成都"]' From 95aafa5c6944ad4b19c7952e743a01c0dc6ff84f Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Wed, 15 May 2024 18:01:54 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E7=82=B9=E6=A3=80=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/inspectionItem/index.ts | 57 ++++ src/api/eam/spotCheckItem/index.ts | 56 ++++ src/utils/dict.ts | 4 + src/utils/disposition/defaultButtons.ts | 2 +- .../equipmentManufacturer.data.ts | 28 +- .../equipmentSupplier.data.ts | 28 +- src/views/eam/inspectionItem/index.vue | 272 ++++++++++++++++++ .../eam/inspectionItem/inspectionItem.data.ts | 110 +++++++ src/views/eam/spotCheckItem/index.vue | 268 +++++++++++++++++ .../eam/spotCheckItem/spotCheckItem.data.ts | 104 +++++++ 10 files changed, 882 insertions(+), 47 deletions(-) create mode 100644 src/api/eam/inspectionItem/index.ts create mode 100644 src/api/eam/spotCheckItem/index.ts create mode 100644 src/views/eam/inspectionItem/index.vue create mode 100644 src/views/eam/inspectionItem/inspectionItem.data.ts create mode 100644 src/views/eam/spotCheckItem/index.vue create mode 100644 src/views/eam/spotCheckItem/spotCheckItem.data.ts diff --git a/src/api/eam/inspectionItem/index.ts b/src/api/eam/inspectionItem/index.ts new file mode 100644 index 000000000..a4b441c0c --- /dev/null +++ b/src/api/eam/inspectionItem/index.ts @@ -0,0 +1,57 @@ +import request from '@/config/axios' + +export interface InspectionItemVO { + id: number + content: string + equipmentParts: string + serialNumber: number + category: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询巡检项列表 +export const getInspectionItemPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/basic/inspection-item/senior', data }) + } else { + return await request.get({ url: `/eam/basic/inspection-item/page`, params }) + } +} + +// 查询巡检项详情 +export const getInspectionItem = async (id: number) => { + return await request.get({ url: `/eam/basic/inspection-item/get?id=` + id }) +} + +// 新增巡检项 +export const createInspectionItem = async (data: InspectionItemVO) => { + return await request.post({ url: `/eam/basic/inspection-item/create`, data }) +} + +// 修改巡检项 +export const updateInspectionItem = async (data: InspectionItemVO) => { + return await request.put({ url: `/eam/basic/inspection-item/update`, data }) +} + +// 删除巡检项 +export const deleteInspectionItem = async (id: number) => { + return await request.delete({ url: `/eam/basic/inspection-item/delete?id=` + id }) +} + +// 导出巡检项 Excel +export const exportInspectionItem = async (params) => { + return await request.download({ url: `/eam/basic/inspection-item/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/basic/inspection-item/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/eam/spotCheckItem/index.ts b/src/api/eam/spotCheckItem/index.ts new file mode 100644 index 000000000..0d2bac635 --- /dev/null +++ b/src/api/eam/spotCheckItem/index.ts @@ -0,0 +1,56 @@ +import request from '@/config/axios' + +export interface SpotCheckItemVO { + id: number + content: string + equipmentParts: string + serialNumber: number + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询点检项列表 +export const getSpotCheckItemPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/basic/spot-check-item/senior', data }) + } else { + return await request.get({ url: `/eam/basic/spot-check-item/page`, params }) + } +} + +// 查询点检项详情 +export const getSpotCheckItem = async (id: number) => { + return await request.get({ url: `/eam/basic/spot-check-item/get?id=` + id }) +} + +// 新增点检项 +export const createSpotCheckItem = async (data: SpotCheckItemVO) => { + return await request.post({ url: `/eam/basic/spot-check-item/create`, data }) +} + +// 修改点检项 +export const updateSpotCheckItem = async (data: SpotCheckItemVO) => { + return await request.put({ url: `/eam/basic/spot-check-item/update`, data }) +} + +// 删除点检项 +export const deleteSpotCheckItem = async (id: number) => { + return await request.delete({ url: `/eam/basic/spot-check-item/delete?id=` + id }) +} + +// 导出点检项 Excel +export const exportSpotCheckItem = async (params) => { + return await request.download({ url: `/eam/basic/spot-check-item/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/basic/spot-check-item/get-import-template' }) +} \ No newline at end of file diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 9d701ad18..b8a84e8e6 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -337,4 +337,8 @@ export enum DICT_TYPE { INTERFACE_STATUS = 'interfaceStatus', // 接口调用信息 接口状态 SYSTEM_DAY = 'system_day', // 系统天数 PURCHASE_INVOICE_ORDER_TYPE = 'purchase_invoice_order_type', // 发票采购订单类型 + + // ========== eam - 业务 - ========== + DEVICE_TYPE = 'device_type', // 设备类型 + } diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 408141d1d..bd999713c 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -269,7 +269,7 @@ export function mainListEnableBtn(option:any) { label: t(`ts.启用`).replace('ts.', ''), name: 'enable', hide: false, - type: 'danger', + type: 'success', color: '', link: true, // 文本展现按钮 hasPermi: '' diff --git a/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts b/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts index b2f57cff9..1050b4ee3 100644 --- a/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts +++ b/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts @@ -82,7 +82,10 @@ export const EquipmentManufacturer = useCrudSchemas(reactive([ label: '部门', field: 'departmentCode', sort: 'custom', - isSearch: true, + isTable: false, + isDetail: false, + isSearch: false, + isTableForm: false, form: { component: 'TreeSelect', componentProps: { // 假设deptList是部门数据列表 @@ -105,28 +108,7 @@ export const EquipmentManufacturer = useCrudSchemas(reactive([ } } }, - { - label: '是否可用', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: true, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - search: { - component: 'Select', - }, - table: { - width: 110 - } - }, + { label: '操作', field: 'action', diff --git a/src/views/eam/equipmentSupplier/equipmentSupplier.data.ts b/src/views/eam/equipmentSupplier/equipmentSupplier.data.ts index 2aaf9e1d6..d4f9d4548 100644 --- a/src/views/eam/equipmentSupplier/equipmentSupplier.data.ts +++ b/src/views/eam/equipmentSupplier/equipmentSupplier.data.ts @@ -88,7 +88,10 @@ export const EquipmentSupplier = useCrudSchemas(reactive([ label: '部门', field: 'departmentCode', sort: 'custom', - isSearch: true, + isTable: false, + isDetail: false, + isSearch: false, + isTableForm: false, form: { component: 'TreeSelect', componentProps: { // 假设deptList是部门数据列表 @@ -111,28 +114,7 @@ export const EquipmentSupplier = useCrudSchemas(reactive([ } } }, - { - label: '是否可用', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: true, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - search: { - component: 'Select', - }, - table: { - width: 110 - } - }, + { label: '操作', field: 'action', diff --git a/src/views/eam/inspectionItem/index.vue b/src/views/eam/inspectionItem/index.vue new file mode 100644 index 000000000..2b72fdde4 --- /dev/null +++ b/src/views/eam/inspectionItem/index.vue @@ -0,0 +1,272 @@ + + + diff --git a/src/views/eam/inspectionItem/inspectionItem.data.ts b/src/views/eam/inspectionItem/inspectionItem.data.ts new file mode 100644 index 000000000..1e310154e --- /dev/null +++ b/src/views/eam/inspectionItem/inspectionItem.data.ts @@ -0,0 +1,110 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' +import { handleTreeToComponentOptions } from '@/utils/tree' +import * as DeptApi from '@/api/system/dept' +const deptList = ref([]) // 树形结构 + +// 加载部门树（默认格式） +deptList.value = handleTreeToComponentOptions(await DeptApi.getSimpleDeptList()) + +// 表单校验 +export const InspectionItemRules = reactive({ + content: [required], + serialNumber: [required], + concurrencyStamp: [required], + type: [required], +}) + +export const InspectionItem = useCrudSchemas(reactive([ + + { + label: '巡检内容', + field: 'content', + sort: 'custom', + isSearch: true, + form: { + component: 'Input', + componentProps: { + type: 'textarea' + } + } + }, + { + label: '保养部位', + field: 'equipmentParts', + sort: 'custom', + isSearch: true + }, + { + label: '类别', + field: 'category', + sort: 'custom', + isSearch: true + }, + { + label: '序号', + field: 'serialNumber', + sort: 'custom', + isSearch: true, + fixed: 'left', + form: { + component:'InputNumber' + }, + }, + { + label: '来源于类型配置', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: true, + form: { + component: 'Select' + } + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isTable: false, + isDetail: false, + isSearch: false, + isTableForm: false, + form: { + component: 'TreeSelect', + componentProps: { // 假设deptList是部门数据列表 + data: deptList, + placeholder: "请选择部门", + filterable: true, + // multiple: true, + } + } + }, + { + label: '是否启用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/eam/spotCheckItem/index.vue b/src/views/eam/spotCheckItem/index.vue new file mode 100644 index 000000000..1f448a231 --- /dev/null +++ b/src/views/eam/spotCheckItem/index.vue @@ -0,0 +1,268 @@ + + + diff --git a/src/views/eam/spotCheckItem/spotCheckItem.data.ts b/src/views/eam/spotCheckItem/spotCheckItem.data.ts new file mode 100644 index 000000000..67902adfb --- /dev/null +++ b/src/views/eam/spotCheckItem/spotCheckItem.data.ts @@ -0,0 +1,104 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' +import { handleTreeToComponentOptions } from '@/utils/tree' +import * as DeptApi from '@/api/system/dept' +const deptList = ref([]) // 树形结构 + +// 加载部门树（默认格式） +deptList.value = handleTreeToComponentOptions(await DeptApi.getSimpleDeptList()) + +// 表单校验 +export const SpotCheckItemRules = reactive({ + content: [required], + serialNumber: [required], + concurrencyStamp: [required], + type: [required], +}) + +export const SpotCheckItem = useCrudSchemas(reactive([ + + { + label: '点检内容', + field: 'content', + sort: 'custom', + isSearch: true, + form: { + component: 'Input', + componentProps: { + type: 'textarea' + } + } + }, + { + label: '点检部位', + field: 'equipmentParts', + sort: 'custom', + isSearch: true + }, + { + label: '序号', + field: 'serialNumber', + sort: 'custom', + isSearch: true, + fixed: 'left', + form: { + component:'InputNumber' + }, + }, + { + label: '来源于类型配置', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: true, + form: { + component: 'Select' + } + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isTable: false, + isDetail: false, + isSearch: false, + isTableForm: false, + form: { + component: 'TreeSelect', + componentProps: { // 假设deptList是部门数据列表 + data: deptList, + placeholder: "请选择部门", + filterable: true, + // multiple: true, + } + } + }, + { + label: '是否启用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) From 16525dc710e4c35060605a82ea27ca63ae6206f1 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 16 May 2024 07:36:04 +0800 Subject: [PATCH 04/26] =?UTF-8?q?dev=E5=8F=91=E5=B8=832024-05-16-001?= 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 74eef9397..ec95ec418 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## dev发布2024-05-15-004 +## dev发布2024-05-16-001 **xxxx.data.ts 文件配置说明** **form表单查询弹窗配置** form: { From 3a10fae8b82e79a79a92c4891f02f30001e62d6b Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 16 May 2024 07:51:59 +0800 Subject: [PATCH 05/26] =?UTF-8?q?dev=E5=8F=91=E5=B8=832024-05-16-002?= 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 ec95ec418..82b41ee1a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## dev发布2024-05-16-001 +## dev发布2024-05-16-002 **xxxx.data.ts 文件配置说明** **form表单查询弹窗配置** form: { From 844d62a6a4e6cefac62bb8afa79df52b860bd4b6 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Thu, 16 May 2024 08:57:17 +0800 Subject: [PATCH 06/26] =?UTF-8?q?=E5=88=B6=E9=80=A0=E5=95=86=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E6=B7=BB=E5=8A=A0=E7=A6=81=E7=94=A8=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipmentManufacturer.data.ts | 12 +++++++ src/views/eam/equipmentManufacturer/index.vue | 33 +++++++++++++++++-- .../equipmentSupplier.data.ts | 12 +++++++ src/views/eam/equipmentSupplier/index.vue | 32 ++++++++++++++++-- src/views/eam/inspectionItem/index.vue | 15 ++++----- src/views/eam/spotCheckItem/index.vue | 12 ++++--- 6 files changed, 97 insertions(+), 19 deletions(-) diff --git a/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts b/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts index 1050b4ee3..0be8d0a86 100644 --- a/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts +++ b/src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts @@ -96,6 +96,18 @@ export const EquipmentManufacturer = useCrudSchemas(reactive([ } } }, + { + label: '是否启用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, + }, { label: '备注', field: 'remark', diff --git a/src/views/eam/equipmentManufacturer/index.vue b/src/views/eam/equipmentManufacturer/index.vue index 3189ad974..b30215282 100644 --- a/src/views/eam/equipmentManufacturer/index.vue +++ b/src/views/eam/equipmentManufacturer/index.vue @@ -33,7 +33,7 @@ @@ -90,6 +90,15 @@ const updataTableColumns = (val) => { tableColumns.value = val } + +const judgeStatus = (row) =>{ + if(row.available === 'TRUE'){ + return true + }else{ + return false + } +} + const { tableObject, tableMethods } = useTable({ getListApi: EquipmentManufacturerApi.getEquipmentManufacturerPage // 分页接口 }) @@ -132,10 +141,13 @@ const buttonBaseClick = (val, item) => { } // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return [ defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-manufacturer:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hasPermi:'eam:inspection-item:enable',hide: judgeStatus(row)}), // 启用 + defaultButtons.mainListDisableBtn({hasPermi:'eam:inspection-item:disable',hide: !judgeStatus(row)}), // 禁用 // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-manufacturer:delete'}), // 删除 -] +]} // 列表-操作按钮事件 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,'TRUE') + }else if (val == 'disable') {// 禁用 + handleEnable(row,'FALSE') } } @@ -235,6 +251,17 @@ const searchFormClick = (searchData) => { getList() // 刷新当前列表 } +const handleEnable = (row,enable) =>{ + message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(() => { + row.available = enable + EquipmentManufacturerApi.updateEquipmentManufacturer(row).then(res => { + message.success(t('common.updateSuccess')) + getList() + }) + }) + +} + /** 初始化 **/ onMounted(async () => { getList() diff --git a/src/views/eam/equipmentSupplier/equipmentSupplier.data.ts b/src/views/eam/equipmentSupplier/equipmentSupplier.data.ts index d4f9d4548..7e7fc6377 100644 --- a/src/views/eam/equipmentSupplier/equipmentSupplier.data.ts +++ b/src/views/eam/equipmentSupplier/equipmentSupplier.data.ts @@ -102,6 +102,18 @@ export const EquipmentSupplier = useCrudSchemas(reactive([ } } }, + { + label: '是否启用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, + }, { label: '备注', field: 'remark', diff --git a/src/views/eam/equipmentSupplier/index.vue b/src/views/eam/equipmentSupplier/index.vue index 3a41de721..e9ffeac07 100644 --- a/src/views/eam/equipmentSupplier/index.vue +++ b/src/views/eam/equipmentSupplier/index.vue @@ -33,7 +33,7 @@ @@ -90,6 +90,15 @@ const updataTableColumns = (val) => { tableColumns.value = val } + +const judgeStatus = (row) =>{ + if(row.available === 'TRUE'){ + return true + }else{ + return false + } +} + const { tableObject, tableMethods } = useTable({ getListApi: EquipmentSupplierApi.getEquipmentSupplierPage // 分页接口 }) @@ -132,10 +141,13 @@ const buttonBaseClick = (val, item) => { } // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { + return [ defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-supplier:update'}), // 编辑 + defaultButtons.mainListEnableBtn({hasPermi:'eam:inspection-item:enable',hide: judgeStatus(row)}), // 启用 + defaultButtons.mainListDisableBtn({hasPermi:'eam:inspection-item:disable',hide: !judgeStatus(row)}), // 禁用 // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-supplier:delete'}), // 删除 -] +]} // 列表-操作按钮事件 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,'TRUE') + }else if (val == 'disable') {// 禁用 + handleEnable(row,'FALSE') } } @@ -235,6 +251,16 @@ const searchFormClick = (searchData) => { getList() // 刷新当前列表 } +const handleEnable = (row,enable) =>{ + message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(() => { + row.available = enable + EquipmentSupplierApi.updateEquipmentSupplier(row).then(res => { + message.success(t('common.updateSuccess')) + getList() + }) + }) +} + /** 初始化 **/ onMounted(async () => { getList() diff --git a/src/views/eam/inspectionItem/index.vue b/src/views/eam/inspectionItem/index.vue index 2b72fdde4..fb132513f 100644 --- a/src/views/eam/inspectionItem/index.vue +++ b/src/views/eam/inspectionItem/index.vue @@ -253,16 +253,15 @@ const searchFormClick = (searchData) => { } const handleEnable = (row,enable) =>{ - row.available = enable - InspectionItemApi.updateInspectionItem(row).then(res => { - message.success(t('common.updateSuccess')) - getList() - }) + message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(() => { + row.available = enable + InspectionItemApi.updateInspectionItem(row).then(res => { + message.success(t('common.updateSuccess')) + getList() + }) + }) } - - - /** 初始化 **/ onMounted(async () => { getList() diff --git a/src/views/eam/spotCheckItem/index.vue b/src/views/eam/spotCheckItem/index.vue index 1f448a231..6fc7ba504 100644 --- a/src/views/eam/spotCheckItem/index.vue +++ b/src/views/eam/spotCheckItem/index.vue @@ -252,11 +252,13 @@ const searchFormClick = (searchData) => { const handleEnable = (row,enable) =>{ - row.available = enable - SpotCheckItemApi.updateSpotCheckItem(row).then(res => { - message.success(t('common.updateSuccess')) - getList() - }) + message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(() => { + row.available = enable + SpotCheckItemApi.updateSpotCheckItem(row).then(res => { + message.success(t('common.updateSuccess')) + getList() + }) + }) } /** 初始化 **/ From 589aafba777b1ea40c9f3774507fd14e0bec6173 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 16 May 2024 09:52:19 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E5=A2=9E=E5=8A=A0https?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.hella15 | 4 ++-- .env.hella16 | 4 ++-- nginx_prod.conf | 24 ++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.env.hella15 b/.env.hella15 index dc2a813d1..77d905c14 100644 --- a/.env.hella15 +++ b/.env.hella15 @@ -4,10 +4,10 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://172.21.32.15/api' +VITE_BASE_URL='https://172.21.32.15:55563/api' # 上传路径 -VITE_UPLOAD_URL='http://172.21.32.15/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='https://172.21.32.15:55563/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= diff --git a/.env.hella16 b/.env.hella16 index 9672dcd3e..251fa31e6 100644 --- a/.env.hella16 +++ b/.env.hella16 @@ -4,10 +4,10 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://172.21.32.16/api' +VITE_BASE_URL='https://172.21.32.16:55563/api' # 上传路径 -VITE_UPLOAD_URL='http://172.21.32.16/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='https://172.21.32.16:55563/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= diff --git a/nginx_prod.conf b/nginx_prod.conf index b849be01c..225deb142 100644 --- a/nginx_prod.conf +++ b/nginx_prod.conf @@ -49,5 +49,29 @@ http { index index.html index.htm; } } + server { + listen 55563 ssl; + server_name_in_redirect off; + server_name _; + ssl_certificate /opt/faway-hella/faway-hella.com.pem; + ssl_certificate_key /opt/faway-hella/faway-hella.com.key; + location /api/ { + proxy_pass http://sfms3.0/; + proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; + proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $http_x_forwarded_for; + } + location /profile/ { + alias /opt/profile/; + index index.html index.htm; + } + location / { + try_files $uri $uri/ /index.html; + root /opt/sfms3.0; + index index.html index.htm; + } + } } From e98baf8d52ed8278582aa866cbd15a5336be4647 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Thu, 16 May 2024 10:41:37 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=A1=B9=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/inspectionItem/index.ts | 7 ++++++- src/api/eam/spotCheckItem/index.ts | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/api/eam/inspectionItem/index.ts b/src/api/eam/inspectionItem/index.ts index a4b441c0c..86b606728 100644 --- a/src/api/eam/inspectionItem/index.ts +++ b/src/api/eam/inspectionItem/index.ts @@ -48,7 +48,12 @@ export const deleteInspectionItem = async (id: number) => { // 导出巡检项 Excel export const exportInspectionItem = async (params) => { - return await request.download({ url: `/eam/basic/inspection-item/export-excel`, params }) + if (params.isSearch) { + const data = { ...params } + return await request.downloadPost({ url: `/eam/basic/inspection-item/export-excel-senior`, data }) + } else { + return await request.download({ url: `/eam/basic/inspection-item/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/eam/spotCheckItem/index.ts b/src/api/eam/spotCheckItem/index.ts index 0d2bac635..e1f587c23 100644 --- a/src/api/eam/spotCheckItem/index.ts +++ b/src/api/eam/spotCheckItem/index.ts @@ -47,7 +47,13 @@ export const deleteSpotCheckItem = async (id: number) => { // 导出点检项 Excel export const exportSpotCheckItem = async (params) => { - return await request.download({ url: `/eam/basic/spot-check-item/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.downloadPost({ url: `/eam/basic/spot-check-item/export-excel-senior`, data }) + } else { + return await request.download({ url: `/eam/basic/spot-check-item/export-excel`, params }) + } } // 下载用户导入模板 From b29249495f80667faaf57c7500bd42be50cd3912 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Thu, 16 May 2024 10:54:29 +0800 Subject: [PATCH 09/26] =?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=20=E5=AF=BC=E5=87=BA/=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E7=AD=9B=E9=80=89=E5=AF=BC=E5=87=BA=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/equipmentMainPart/index.ts | 7 +++++- .../basicInspectionOption.data.ts | 2 +- .../basicMaintenanceOption.data.ts | 2 +- .../equipmentMainPart.data.ts | 25 +++++++++++-------- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/api/eam/equipmentMainPart/index.ts b/src/api/eam/equipmentMainPart/index.ts index a5d7acdd2..6a081dd4c 100644 --- a/src/api/eam/equipmentMainPart/index.ts +++ b/src/api/eam/equipmentMainPart/index.ts @@ -48,7 +48,12 @@ export const deleteEquipmentMainPart = async (id: number) => { // 导出主要部件 Excel export const exportEquipmentMainPart = async (params) => { - return await request.download({ url: `/eam/equipment-main-part/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/equipment-main-part/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/eam/equipment-main-part/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/eam/basicInspectionOption/basicInspectionOption.data.ts b/src/views/eam/basicInspectionOption/basicInspectionOption.data.ts index 6e7fe83bf..d826259c0 100644 --- a/src/views/eam/basicInspectionOption/basicInspectionOption.data.ts +++ b/src/views/eam/basicInspectionOption/basicInspectionOption.data.ts @@ -51,7 +51,7 @@ export const BasicInspectionOption = useCrudSchemas(reactive([ }, }, { - label: '来源于类型配置', + label: '巡检项', field: 'type', sort: 'custom', isSearch: true, diff --git a/src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts b/src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts index fe26160a5..b3fdbcfb2 100644 --- a/src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts +++ b/src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts @@ -51,7 +51,7 @@ export const BasicMaintenanceOption = useCrudSchemas(reactive([ }, }, { - label: '来源于类型配置', + label: '保养项', field: 'type', sort: 'custom', isSearch: true, diff --git a/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts b/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts index efba49dec..ed90c0233 100644 --- a/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts +++ b/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts @@ -31,10 +31,15 @@ export const EquipmentMainPart = useCrudSchemas(reactive([ isSearch: true, }, { - label: '设备工装枚举', + label: '类型', field: 'type', sort: 'custom', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isSearch: true, + form: { + component: 'Select' + } }, { label: '创建时间', @@ -77,18 +82,16 @@ export const EquipmentMainPart = useCrudSchemas(reactive([ isDetail:false, }, { - label: '是否可用', + label: '是否启用', field: 'available', sort: 'custom', - isSearch: true, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, }, { label: '删除时间', From a1e7689fc2372a067f45961aff7ba079219d343e Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Thu, 16 May 2024 11:26:42 +0800 Subject: [PATCH 10/26] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=20=20=E5=AF=BC=E5=87=BA/=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E7=AD=9B=E9=80=89=E5=AF=BC=E5=87=BA=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/basicDocumentType/index.ts | 7 ++++++- .../basicDocumentType.data.ts | 20 +++++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/api/eam/basicDocumentType/index.ts b/src/api/eam/basicDocumentType/index.ts index 0ab30af39..ec53a58df 100644 --- a/src/api/eam/basicDocumentType/index.ts +++ b/src/api/eam/basicDocumentType/index.ts @@ -48,7 +48,12 @@ export const deleteDocumentType = async (id: number) => { // 导出文档类型 Excel export const exportDocumentType = async (params) => { - return await request.download({ url: `/eam/document-type/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/document-type/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/eam/document-type/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/eam/basicDocumentType/basicDocumentType.data.ts b/src/views/eam/basicDocumentType/basicDocumentType.data.ts index 38605efc5..0456ee3c7 100644 --- a/src/views/eam/basicDocumentType/basicDocumentType.data.ts +++ b/src/views/eam/basicDocumentType/basicDocumentType.data.ts @@ -35,7 +35,12 @@ export const DocumentType = useCrudSchemas(reactive([ label: '类型设备', field: 'type', sort: 'custom', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isSearch: true, + form: { + component: 'Select' + } }, { label: '创建时间', @@ -81,14 +86,13 @@ export const DocumentType = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, }, { label: '删除时间', From 95fa8708b288723dc834287d472d31ef5ecc3d3a Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Thu, 16 May 2024 11:55:13 +0800 Subject: [PATCH 11/26] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=E6=95=85?= =?UTF-8?q?=E9=9A=9C=E5=8E=9F=E5=9B=A0=20=20=E5=AF=BC=E5=87=BA/=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E7=AD=9B=E9=80=89=E5=AF=BC=E5=87=BA=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/basicFaultCause/index.ts | 7 ++++++- .../eam/basicFaultCause/basicFaultCause.data.ts | 15 +++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/api/eam/basicFaultCause/index.ts b/src/api/eam/basicFaultCause/index.ts index ff5aed0e5..ffffb2d80 100644 --- a/src/api/eam/basicFaultCause/index.ts +++ b/src/api/eam/basicFaultCause/index.ts @@ -49,7 +49,12 @@ export const deleteBasicFaultCause = async (id: number) => { // 导出故障原因 Excel export const exportBasicFaultCause = async (params) => { - return await request.download({ url: `/eam/basic-fault-cause/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/basic-fault-cause/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/eam/basic-fault-cause/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/eam/basicFaultCause/basicFaultCause.data.ts b/src/views/eam/basicFaultCause/basicFaultCause.data.ts index 3704d71a1..3dc367434 100644 --- a/src/views/eam/basicFaultCause/basicFaultCause.data.ts +++ b/src/views/eam/basicFaultCause/basicFaultCause.data.ts @@ -92,14 +92,13 @@ export const BasicFaultCause = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, }, { label: '删除时间', From 636ae3d485cd0c780a9b6d226ea18e748a71f2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 16 May 2024 13:14:36 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=9F=E6=88=B7=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.hella15 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.hella15 b/.env.hella15 index 77d905c14..15f726a54 100644 --- a/.env.hella15 +++ b/.env.hella15 @@ -37,4 +37,4 @@ 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='["长春"]' +VITE_TENANT='["长春","成都"]' From 253b6ae891a7ce376491bae1f433869bf70d81a4 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Thu, 16 May 2024 13:21:10 +0800 Subject: [PATCH 13/26] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=E6=95=85?= =?UTF-8?q?=E9=9A=9C=E7=B1=BB=E5=9E=8B=20=20=E5=AF=BC=E5=87=BA/=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E7=AD=9B=E9=80=89=E5=AF=BC=E5=87=BA=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/basicFaultType/index.ts | 7 ++++++- .../eam/basicFaultType/basicFaultType.data.ts | 15 +++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/api/eam/basicFaultType/index.ts b/src/api/eam/basicFaultType/index.ts index 899b82ec4..3af2b44ce 100644 --- a/src/api/eam/basicFaultType/index.ts +++ b/src/api/eam/basicFaultType/index.ts @@ -48,7 +48,12 @@ export const deleteBasicFaultType = async (id: number) => { // 导出故障类型 Excel export const exportBasicFaultType = async (params) => { - return await request.download({ url: `/eam/basic-fault-type/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/basic-fault-type/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/eam/basic-fault-type/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/eam/basicFaultType/basicFaultType.data.ts b/src/views/eam/basicFaultType/basicFaultType.data.ts index 4a2802690..8fe42a032 100644 --- a/src/views/eam/basicFaultType/basicFaultType.data.ts +++ b/src/views/eam/basicFaultType/basicFaultType.data.ts @@ -79,14 +79,13 @@ export const BasicFaultType = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, }, { label: '删除时间', From f6f924698887895a15abc21f6185b374be8ddab6 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 16 May 2024 13:40:03 +0800 Subject: [PATCH 14/26] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceipt/purchasereceiptRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 4c9127c44..14a4a00e4 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -420,7 +420,7 @@ const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAcces const searchTableRef = ref() const labelPrint = async (row) => { tableObject.loading = true - const defaultParams = {'moduleName':'supplier','recordNumber':row.number} + const defaultParams = {'moduleName':'purchasereceipt_request','recordNumber':row.asnNumber} const {tableObject:tableObjectPrint ,tableMethods} = useTable({ defaultParams, getListApi: PackageApi.getLabelDetailPage // 分页接口 From 51d9251a487dae4bc5320039c6d9f927ec25cb8a Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Thu, 16 May 2024 13:44:10 +0800 Subject: [PATCH 15/26] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=B6?= =?UTF-8?q?=E9=80=A0=E5=95=86=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/equipmentManufacturer/index.ts | 7 ++++++- src/api/eam/equipmentSupplier/index.ts | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/api/eam/equipmentManufacturer/index.ts b/src/api/eam/equipmentManufacturer/index.ts index d735e38e4..6efa2cbb2 100644 --- a/src/api/eam/equipmentManufacturer/index.ts +++ b/src/api/eam/equipmentManufacturer/index.ts @@ -54,7 +54,12 @@ export const deleteEquipmentManufacturer = async (id: number) => { // 导出设备制造商 Excel export const exportEquipmentManufacturer = async (params) => { - return await request.download({ url: `/eam/basic/equipment-manufacturer/export-excel`, params }) + if (params.isSearch) { + const data = { ...params } + return await request.downloadPost({ url: `/eam/basic/equipment-manufacturer/export-excel-senior`, data }) + } else { + return await request.download({ url: `/eam/basic/equipment-manufacturer/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/eam/equipmentSupplier/index.ts b/src/api/eam/equipmentSupplier/index.ts index 3026e600c..b6a38dc40 100644 --- a/src/api/eam/equipmentSupplier/index.ts +++ b/src/api/eam/equipmentSupplier/index.ts @@ -54,7 +54,12 @@ export const deleteEquipmentSupplier = async (id: number) => { // 导出供应商 Excel export const exportEquipmentSupplier = async (params) => { - return await request.download({ url: `/eam/basic/equipment-supplier/export-excel`, params }) + if (params.isSearch) { + const data = { ...params } + return await request.downloadPost({ url: `/eam/basic/equipment-supplier/export-excel-senior`, data }) + } else { + return await request.download({ url: `/eam/basic/equipment-supplier/export-excel`, params }) + } } // 下载用户导入模板 From 47b9c5b3d2059b92e99eb6848f5a7044d2f1abea Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Thu, 16 May 2024 13:48:07 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=20?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/orderDay/components/schedule.vue | 35 ++++++----- src/views/mes/orderDay/index.vue | 60 ++++++++++--------- src/views/mes/orderDay/orderDay.data.ts | 3 +- 3 files changed, 53 insertions(+), 45 deletions(-) diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index 9ac9b269e..eccbefcd7 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -201,7 +201,7 @@ @@ -471,20 +471,23 @@ const opensearchTable = ( ) } -const handleClose=()=>{ - dialogVisible.value = false, - emit('close') +const handleClose=(val)=>{ + dialogVisible.value = false + emit('close',val) } const publishPlan=()=>{ - message.confirm("确认发布当前计划？","question").then(async () => { + message.confirm("确认发布当前计划？","提示").then( () => { //isPublish.value=true //loading.value = true, - try{formLoading.value=true - doPublishPlan() }finally{ + try{ + formLoading.value=true + let promise = doPublishPlan(); + handleClose(promise) + }finally{ formLoading.value=false; - handleClose() + } - + }).catch(() => { message.info("已取消发布") }) @@ -517,12 +520,14 @@ const doPublishPlan= ()=>{ let res = OrderDayApi.publishPlan(data) - res.then(()=>{ - message.success("计划发布成功") - }).catch(()=>{ - //console.log("---doPublishPlan-- 458--",res.msg) - message.error("计划发布失败！") - }) + return res + + // res.then(()=>{ + // message.success("计划发布成功") + // }).catch(()=>{ + // //console.log("---doPublishPlan-- 458--",res.msg) + // message.error("计划发布失败！") + // }) } diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue index edcb14390..98a405c6f 100644 --- a/src/views/mes/orderDay/index.vue +++ b/src/views/mes/orderDay/index.vue @@ -57,7 +57,7 @@ :isBusiness="false" :isSearchFilterButtonHide="true" @onChange="valueChange" - + /> @@ -142,7 +142,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { if(formField=='workroomCode'){ getProductlines(val[0][searchField]) } - + }) } @@ -156,9 +156,9 @@ const valueChange=(filed,cur)=>{ //item.componentProps.required = cur==='ENABLE'?false:true } }) - + } - + } // 字段设置 更新主列表字段 @@ -199,10 +199,12 @@ const buttonBaseClick = (val, item) => { console.log('其他按钮', item) } } -const publishClosed=()=>{ - //console.log('orderday-publishClosed-200') - getList() - +const publishClosed=(val)=>{ + console.log('orderday-publishClosed-200',val) + nextTick?.(()=>{ + getList() + }) + } // 根据状态返回该按钮是否显示 const isShowMainButton = (row,val) => { @@ -227,7 +229,7 @@ const butttondata = (row) => { type: 'warning', icon: '', color: '', - hasPermi: 'mes:orderDay:update'}), // + hasPermi: 'mes:orderDay:update'}), // // defaultButtons.mainListHandleBtn({label: '发布', // name: 'publish', // hide: isShowMainButton(row,['2']), @@ -268,25 +270,24 @@ const openForm = (type: string, row?: any) => { // form表单提交 const formsSuccess = async (formType,data) => { - + if (formType === 'create') { - let ret= OrderDayApi.createOrderDay(data) - if(ret===undefined || ret===null){ - message.error(t('common.networkError')) - }else{ - message.success(t('common.createSuccess')) - } - + await OrderDayApi.createOrderDay(data) + // if(ret===undefined || ret===null){ + // message.error(t('common.networkError')) + // }else{ + // message.success(t('common.createSuccess')) + // } + } else { - let ret= OrderDayApi.updateOrderDay(data) - if(ret.code==0){ - message.success(t('common.updateSuccess')) - }else{ - message.error(t('common.networkError')) - } - + await OrderDayApi.updateOrderDay(data) + // if(ret.code==0){ + // message.success(t('common.updateSuccess')) + // }else{ + // message.error(t('common.networkError')) + // } + } - basicFormRef.value.dialogVisible = false await getList() } @@ -301,7 +302,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { //console.log('orderDay-openDetail-303',row) sDetailRef.value.open(row, titleName) } - + } /** 发布操作 */ const scheduleDetailRef = ref() @@ -336,9 +337,10 @@ const handleExport = async () => { exportLoading.value = false } } -const stopPlan = (id) => { - OrderDayApi.stopPlan(id) - +const stopPlan = async (id) => { + await OrderDayApi.stopPlan(id) + getList() + } /** 导入 */ const importFormRef = ref() diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts index 43bed9d1e..d2d6a1109 100644 --- a/src/views/mes/orderDay/orderDay.data.ts +++ b/src/views/mes/orderDay/orderDay.data.ts @@ -49,6 +49,7 @@ export const OrderDay = useCrudSchemas(reactive([ field: 'id', sort: 'custom', isForm: false, + isTable: false, width: '60px', }, { @@ -365,7 +366,7 @@ export const OrderDay = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: false, - isTable:false, + // isTable:false, }, { label: '操作', From 3949f78e79c380d67b75b96ded713043d1cf11ff Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 16 May 2024 13:56:01 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRequestMain.data.ts | 1 - .../deliver/deliverRequestMain/index.vue | 3 --- .../saleShipmentMainRecord/index.vue | 17 ++++++++--------- .../saleShipmentMainRecord.data.ts | 3 +++ .../saleShipmentMainRequest/index.vue | 2 +- .../saleShipmentMain.data.ts | 6 ++---- .../containerMainRequest.data.ts | 5 +---- 7 files changed, 15 insertions(+), 22 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index caf69fc42..54715ea57 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -786,7 +786,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ field: 'uom', dictType: DICT_TYPE.UOM, dictClass: 'string', - isTable: true, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 3a6f4ac74..8e0e37a1e 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -567,9 +567,6 @@ const resetShow = async () => { item.tableForm.isInpuFocusShow = true item.tableForm.disabled = false } - if(item.field == 'uom') { - item.tableForm.disabled = false - } if(item.field == 'available') { item.tableForm.disabled = false } diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue index df789bd3d..e00bd5819 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue @@ -27,9 +27,9 @@ v-model:currentPage="tableObject.currentPage" v-model:sort="tableObject.sort" > -