From cc75d8db80057f8b1c073590529fda8c6072379e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 27 Mar 2024 14:49:45 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/BasicForm/src/BasicForm.vue | 1 +
src/components/Dialog/src/Dialog.vue | 23 +++++++++++++++++++++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 32b083d..7a8c2fe 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -4,6 +4,7 @@
v-model="dialogVisible"
:width="isBusiness ? '60%' : '40%'"
:close-on-click-modal="false"
+ :vLoading="formLoading"
>
diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index a1eb550..7d9272c 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -11,7 +11,8 @@ const props = defineProps({
fullscreen: propTypes.bool.def(true),
width: propTypes.oneOfType([String, Number]).def('40%'),
scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话,按照 maxHeight 设置最大高度
- maxHeight: propTypes.oneOfType([String, Number]).def('400px')
+ maxHeight: propTypes.oneOfType([String, Number]).def('400px'),
+ vLoading:propTypes.bool.def(false)
})
const getBindValue = computed(() => {
@@ -34,6 +35,22 @@ const toggleFull = () => {
const dialogHeight = ref(isNumber(props.maxHeight) ? `${props.maxHeight}px` : props.maxHeight)
+
+let demo = null
+watch(
+ () => props.vLoading,
+ async (val: boolean) => {
+ await nextTick()
+ if (val) {
+ initDialog()
+ } else {
+ if (demo !== null) demo.close()
+ }
+ },
+ {
+ immediate: true
+ }
+)
watch(
() => isFullscreen.value,
async (val: boolean) => {
@@ -55,6 +72,10 @@ const dialogStyle = computed(() => {
height: unref(dialogHeight)
}
})
+const initDialog = () => {
+ // 用服务生成一个el-loading实例,包括了自定义svg的指令如何在服务中使用
+ demo = ElLoading.service({ target: '.loading', text: '加载中...', background: 'rgba(246, 246, 246, 0.8)' })
+}
From 8b605b3bb0d65a132f944bce08b938750a644df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Wed, 27 Mar 2024 15:23:41 +0800
Subject: [PATCH 2/7] =?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
---
.../eam/basic/deviceMaintenance/deviceMaintenance.data.ts | 1 +
.../eam/basic/moldMaintenance/moldMaintenance.data.ts | 3 ++-
src/views/eam/item/itemApplyMain/itemApplyMain.data.ts | 2 --
.../eam/item/itemMaintenance/itemMaintenance.data.ts | 8 ++++++--
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
index a42e068..c321376 100644
--- a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
+++ b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
@@ -135,6 +135,7 @@ export const DeviceMaintenance = useCrudSchemas(reactive([
component: 'InputNumber',
componentProps: {
min: 1,
+ max: 100,
precision: 0
}
},
diff --git a/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
index 087478a..9f6f201 100644
--- a/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
+++ b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
@@ -122,7 +122,7 @@ export const MoldMaintenance = useCrudSchemas(reactive([
component: 'Select'
},
},
- {
+{
label: '人数',
field: 'peoples',
sort: 'custom',
@@ -134,6 +134,7 @@ export const MoldMaintenance = useCrudSchemas(reactive([
component: 'InputNumber',
componentProps: {
min: 1,
+ max: 100,
precision: 0
}
},
diff --git a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts
index 2a6685d..d053746 100644
--- a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts
+++ b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts
@@ -172,8 +172,6 @@ export const ItemApplyDetail = useCrudSchemas(reactive([
disabled: false
}
},
-
-
{
label: '设备/模具编号',
field: 'deviceNumber',
diff --git a/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts b/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts
index a89b2f0..b72ca4d 100644
--- a/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts
+++ b/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts
@@ -68,8 +68,12 @@ export const ItemMaintenance = useCrudSchemas(reactive([
},
isForm: false,
},
-
- {
+ {
+ label: '维修原因',
+ field: 'reasons',
+ sort: 'custom',
+ },
+ {
label: '是否可用',
field: 'available',
dictType: DICT_TYPE.TRUE_FALSE,
From e9069bd7120bfb4e0018df5e12eec9eee76fb35c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 27 Mar 2024 15:41:17 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/BasicForm/src/BasicForm.vue | 3 +--
src/components/Dialog/src/Dialog.vue | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 7a8c2fe..d4654fe 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -10,7 +10,6 @@
style="max-height: 60vh;overflow-y: auto;">