From 05c15fc690062f72d3316404afbfeef5231795dd Mon Sep 17 00:00:00 2001 From: z_yu <1534695664@qq.com> Date: Thu, 14 Jul 2022 08:56:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=B1=BB=E7=AE=A1=E7=90=86=E9=98=B2?= =?UTF-8?q?=E6=AD=A22=E6=AC=A1=E6=8F=90=E4=BA=A4=E5=8F=8A=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../category/descriptionPreview/index.vue | 7 +- .../category/fileNoFormat/module/form.vue | 8 +- .../category/listBrowsing/module/form.vue | 8 +- .../category/orderingRule/module/form.vue | 7 +- src/views/storeManage/deviceManage/index.vue | 4 +- .../deviceManage/module/deviceDetail.vue | 115 +++++++++++------- 6 files changed, 94 insertions(+), 55 deletions(-) diff --git a/src/views/category/descriptionPreview/index.vue b/src/views/category/descriptionPreview/index.vue index 673b7c0..a9be811 100644 --- a/src/views/category/descriptionPreview/index.vue +++ b/src/views/category/descriptionPreview/index.vue @@ -44,7 +44,7 @@
- 保存 + 保存
@@ -91,7 +91,8 @@ export default { fieldsActive: 0, // 当前字段index thisFields: { dictionaryConfigId: { dicName: null, id: null }}, // 当前项字段内容 editField: {}, - isInputFields: [] + isInputFields: [], + loading: false } }, watch: { @@ -150,7 +151,9 @@ export default { if (!valid) { return } + this.loading = true edit(this.editField).then(() => { + this.loading = false this.$notify({ title: '保存成功', type: 'success', diff --git a/src/views/category/fileNoFormat/module/form.vue b/src/views/category/fileNoFormat/module/form.vue index 8de4c12..43bade4 100644 --- a/src/views/category/fileNoFormat/module/form.vue +++ b/src/views/category/fileNoFormat/module/form.vue @@ -20,7 +20,7 @@
- 保存 + 保存
@@ -33,11 +33,13 @@ export default { return { cuDialogVisible: false, formData: {}, - title: '新增字段' + title: '新增字段', + loading: false } }, methods: { save() { + this.loading = true if (this.title === '新增字段') { const addData = this.formData.fields.map((item) => { return { @@ -55,6 +57,7 @@ export default { duration: 2500 }) this.cuDialogVisible = false + this.loading = false this.$emit('refresh') }) } else { @@ -65,6 +68,7 @@ export default { duration: 2500 }) this.cuDialogVisible = false + this.loading = false this.$emit('refresh') }) } diff --git a/src/views/category/listBrowsing/module/form.vue b/src/views/category/listBrowsing/module/form.vue index d848a97..a19155e 100644 --- a/src/views/category/listBrowsing/module/form.vue +++ b/src/views/category/listBrowsing/module/form.vue @@ -28,7 +28,7 @@
- 保存 + 保存
@@ -55,13 +55,15 @@ export default { label: '靠右', value: 'right' } - ] + ], + loading: false } }, methods: { save() { this.$refs['formData'].validate((valid) => { if (valid) { + this.loading = true if (this.title === '新增字段') { add(this.formData.fields).then((res) => { this.$notify({ @@ -70,6 +72,7 @@ export default { duration: 2500 }) this.cuDialogVisible = false + this.loading = false this.$emit('refresh') }) } else { @@ -80,6 +83,7 @@ export default { duration: 2500 }) this.cuDialogVisible = false + this.loading = false this.$emit('refresh') }) } diff --git a/src/views/category/orderingRule/module/form.vue b/src/views/category/orderingRule/module/form.vue index d70720c..d03febb 100644 --- a/src/views/category/orderingRule/module/form.vue +++ b/src/views/category/orderingRule/module/form.vue @@ -23,7 +23,7 @@
- 保存 + 保存
@@ -36,17 +36,20 @@ export default { return { cuDialogVisible: false, formData: {}, - title: '' + title: '', + loading: false } }, methods: { save() { + this.loading = true edit(this.formData.fields).then((res) => { this.$notify({ title: '保存成功', type: 'success', duration: 2500 }) + this.loading = false this.cuDialogVisible = false this.$emit('refresh') }) diff --git a/src/views/storeManage/deviceManage/index.vue b/src/views/storeManage/deviceManage/index.vue index a3a8240..05013a6 100644 --- a/src/views/storeManage/deviceManage/index.vue +++ b/src/views/storeManage/deviceManage/index.vue @@ -124,8 +124,8 @@ export default { if (val) { this.crud.selectionChangeHandler([val]) this.$refs.deviceDetail.query.id = val.id - this.$refs.deviceDetail.storeroomId = val.id - this.$refs.deviceDetail.crud.toQuery() + this.$refs.deviceDetail.storeroomId = val + // this.$refs.deviceDetail.crud.toQuery() this.activeRightBtn = true } }, diff --git a/src/views/storeManage/deviceManage/module/deviceDetail.vue b/src/views/storeManage/deviceManage/module/deviceDetail.vue index 513968e..56e1b6c 100644 --- a/src/views/storeManage/deviceManage/module/deviceDetail.vue +++ b/src/views/storeManage/deviceManage/module/deviceDetail.vue @@ -8,6 +8,14 @@ @@ -18,7 +26,7 @@
- + @@ -50,23 +58,19 @@ - - 借出 - 归还 - 入库 - 出库 - + 借出 + 归还 + 入库 + 出库 - - 借出 - 归还 - 入库 - 出库 - + 借出 + 归还 + 入库 + 出库 - 通知 + 通知
@@ -93,7 +97,7 @@ - + @@ -133,8 +137,7 @@ import crudDevice from '@/api/storeManage/deviceManage/device' import CRUD, { presenter, header, form } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' - -const defaultForm = { deviceInfo: { supplierId: null }, id: null, isLinkage: [], isCallback: [], isNotice: false } +const defaultForm = { deviceInfo: { supplierId: null }, id: null, isLinkage: { stateType: 1, lend: false, borrow: false, inBound: false, outBound: false }, isCallback: { stateType: 2, lend: false, borrow: false, inBound: false, outBound: false }, isNotice: false } export default { components: { crudOperation, pagination }, @@ -167,16 +170,33 @@ export default { } }, data() { + var checkDeviceIp = (rule, value, callback) => { + const reg = /^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$/ + if (reg.test(value)) { + callback() + } else { + callback(new Error('设备IP格式错误')) + } + } return { storeroomId: null, + deviceType: null, // 设备列表筛选项目（设备类型） needRefreshTree: false, rules: { // deviceInfo. deviceInfo: { - supplierId: [ + supplier: [ { required: true, message: '请选择设备产商', trigger: 'blur' } + ], + deviceName: [ + { required: true, message: '请输入设备名称', trigger: 'blur' } + ], + deviceIp: [ + { required: true, message: '请输入设备IP', trigger: 'blur' }, + { validator: checkDeviceIp, trigger: 'blur' } ] } + // deviceInfo.deviceName }, permission: { add: ['admin', 'dict:add'], @@ -188,60 +208,62 @@ export default { selectDeviceTypeVisible: false, deviceTypeOptions: [ { - value: '选项1', - label: '空调' + id: '89284777EFADA87FA342A7', + name: '空调' }, { - value: 'denseCabinet', - label: '密集架' + id: 'DD656054BE3D1DF1E2F1FC', + name: '密集架' }, { - value: 'rotaryCabinet', - label: '回转柜' + id: '5643ED11723BBA5A4C1856', + name: '回转柜' }, { - value: '选项3', - label: '通道门' + id: '65D1886B0F864291766421', + name: '通道门' }, { - value: '选项4', - label: '摄像头' + id: '7305DE3D273B0CAC079538', + name: '摄像头' }, { - value: '选项5', - label: '恒湿机' + id: 'C09A1946216E496BB3FA88', + name: '恒湿机' }, { - value: '选项6', - label: '漏水传感器' + id: '250AE644EC43E4EC954A81', + name: '漏水传感器' }, { - value: '选项7', - label: '温湿度传感器' + id: '7882487E0C15304A3758AF', + name: '温湿度传感器' }, { - value: '选项8', - label: '空气质量检测设备' + id: 'E58C8D7C896BCB9A408A78', + name: '空气质量检测设备' }, { - value: '选项9', - label: '桌面式RFID读写器' + id: 'E2767FEACA9CE0E3B16B89', + name: '桌面式RFID读写器' }, { - value: '选项10', - label: '手持式RFID读写器' + id: '3B85FA21FDAFBB618B5D40', + name: '手持式RFID读写器' } ], - selectedDeviceType: 'denseCabinet', // 选择添加的设备种类 + selectedDeviceType: 'DD656054BE3D1DF1E2F1FC', // 选择添加的设备种类 supplierOptions: [] // 厂商 } }, computed: { addTypeStr() { - const addType = this.deviceTypeOptions.find(deviceType => deviceType.value === this.selectedDeviceType).label - return '新增' + addType - // console.log('123') - // return this.deviceTypeOptions.find(deviceType => deviceType.value === this.selectedDeviceType) ? this.deviceTypeOptions.filter(deviceType => deviceType.value === this.selectedDeviceType).label : '' + const addType = this.deviceTypeOptions.find(deviceType => deviceType.id === this.selectedDeviceType) + if (addType) { + return '新增' + addType.name + } else { + return '新增' + } } }, methods: { @@ -253,6 +275,9 @@ export default { // }, [CRUD.HOOK.beforeSubmit]() { this.crud.form.deviceInfo.storeroomId = this.storeroomId + this.crud.form.deviceInfo.supplierId = this.supplierOptions.find(item => item.id === this.crud.form.deviceInfo.supplier) + this.crud.form.deviceTypeId = this.deviceTypeOptions.find(item => item.id === this.selectedDeviceType) + this.crud.form.sequence = 2 // if (!this.crud.form.isSequence) { // this.crud.form.isSequence = this.crud.data.reduce((prev, cur) => { return { isSequence: Math.max(prev.isSequence, cur.isSequence) } }).isSequence + 1 // }