From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue b/src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue
index 7504805..1dafa9a 100644
--- a/src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue
+++ b/src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue
@@ -18,7 +18,8 @@
>
<a-input
v-model="model.num"
- placeholder="璇疯緭鍏ュ崟鎹彿"
+ placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚"
+ disabled
></a-input>
</a-form-model-item>
</a-col>
@@ -113,6 +114,7 @@
import { validateDuplicateValue } from '@/utils/util'
// import EquipmentSelection from '@/components/tools/EquipmentSelection.vue'
import EquipmentSelectModal from './EquipmentSelectModal.vue'
+import { getAction, postAction, requestPut } from '@api/manage'
import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
import { JVXETypes } from '@comp/jeecg/JVxeTable'
import { getRefPromise, VALIDATE_FAILED } from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
@@ -194,7 +196,7 @@
defaultValue: ''
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
key: 'equipmentNum',
type: JVXETypes.normal,
width: '150px',
@@ -357,6 +359,7 @@
add: '/eam/equipmentSeal/add',
edit: '/eam/equipmentSeal/edit',
queryById: '/eam/equipmentSeal/queryById',
+ getNum: '/eam/sysIdentity/getNumNew',
equipmentSealDetail: {
list: '/eam/equipmentSeal/listEquipmentSealDetailByMainId'
}
@@ -386,6 +389,7 @@
})
},
methods: {
+
handleChange(value, data) {
this.$nextTick(() => {
this.$set(data, 'maintenanceAfterUnseal', data.maintenanceAfterUnseal)
@@ -466,6 +470,12 @@
if (this.model.id) {
let params = { equipmentChangeId: this.model.id }
this.requestSubTableData(this.url.equipmentSealDetail.list, params, this.equipmentSealDetailTable)
+ }else{
+ getAction(this.url.getNum, { type: 'EquipmentSeal', length: '4' }).then((res) => {
+ if (res.success) {
+ this.model.num = res.message
+ }
+ })
}
},
//鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
--
Gitblit v1.9.3