diff --git a/src/views/rent-facility/index.vue b/src/views/rent-facility/index.vue index f2a640f7..392c7029 100644 --- a/src/views/rent-facility/index.vue +++ b/src/views/rent-facility/index.vue @@ -28,17 +28,17 @@ diff --git a/src/views/rent-facility/line.vue b/src/views/rent-facility/line.vue index db553507..0d018e36 100644 --- a/src/views/rent-facility/line.vue +++ b/src/views/rent-facility/line.vue @@ -4,6 +4,7 @@ {{ title }} + - + + + + @@ -31,11 +37,12 @@ + 新型装备最多统计20分 diff --git a/src/views/system/equipment/index.vue b/src/views/system/equipment/index.vue index cb3f8a3c..14679b56 100644 --- a/src/views/system/equipment/index.vue +++ b/src/views/system/equipment/index.vue @@ -18,7 +18,8 @@ + label-width="70px" + > @@ -167,6 +168,7 @@
配置类型 + 是否新型 基本配置标准(台/套) 装备配置率 配置说明 @@ -181,6 +183,15 @@ :value="dict.value" /> + + + + + { if (res.code === 200) { res.data.forEach(item => { + console.log(item) this.configForm.configs.push(item) }) } @@ -531,7 +545,7 @@ export default { basicConfig: Number(this.configForm.basicConfig) } */ - + console.log(this.configForm) updateEquipmentConfig(this.configForm).then(response => { this.$message.success('配置保存成功') this.getList() diff --git a/src/views/toolsManage/codeToolsLedger/index.vue b/src/views/toolsManage/codeToolsLedger/index.vue index 8e3210d7..25b40a00 100644 --- a/src/views/toolsManage/codeToolsLedger/index.vue +++ b/src/views/toolsManage/codeToolsLedger/index.vue @@ -664,27 +664,27 @@ export default { this.dialogForm.certificateList = this.dialogForm.certificates.map((item) => item.fileUrl).join(',') } if (this.dialogForm.inspectionReports && this.dialogForm.inspectionReports.length > 0) { - this.dialogForm.inspectionReportList = this.dialogForm.inspectionReports.map((item) => item.fileUrl).join(',') + this.dialogForm.inspectionList = this.dialogForm.inspectionReports.map((item) => item.fileUrl).join(',') } if (this.dialogForm.purchaseInvoices && this.dialogForm.purchaseInvoices.length > 0) { this.dialogForm.purchaseInvoicesList = this.dialogForm.purchaseInvoices.map((item) => item.fileUrl).join(',') } - // 确保fileList是数组格式 - if (!Array.isArray(this.dialogForm.fileList)) { - this.dialogForm.fileList = this.dialogForm.fileList - ? this.dialogForm.fileList.split(',').map((url) => ({ - name: url.split('/').pop(), - url: url, - uid: new Date().getTime() + Math.random(), - })) - : [] - } else { - // 为数组中的文件添加uid - this.dialogForm.fileList = this.dialogForm.fileList.map((file) => ({ - ...file, - uid: file.uid || new Date().getTime() + Math.random(), - })) - } + // // 确保fileList是数组格式 + // if (!Array.isArray(this.dialogForm.fileList)) { + // this.dialogForm.fileList = this.dialogForm.fileList + // ? this.dialogForm.fileList.split(',').map((url) => ({ + // name: url.split('/').pop(), + // url: url, + // uid: new Date().getTime() + Math.random(), + // })) + // : [] + // } else { + // // 为数组中的文件添加uid + // this.dialogForm.fileList = this.dialogForm.fileList.map((file) => ({ + // ...file, + // uid: file.uid || new Date().getTime() + Math.random(), + // })) + // } console.log('🚀 ~ this.dialogForm:', this.dialogForm) }) },