From 7d419acae71bb983b272b3b7dec45b8eb8223320 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Mon, 8 Jul 2024 11:39:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=B8=85=E5=86=8C?= =?UTF-8?q?=E7=9A=84=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=92=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/equipmentledgerDetail.vue | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue index df54911..f9f5907 100644 --- a/src/views/leger/equipmentledgerDetail.vue +++ b/src/views/leger/equipmentledgerDetail.vue @@ -16,9 +16,8 @@ :permission="permissionList" :before-open="beforeOpen" :header-cell-class-name="headerClass" - v-model="form" + v-model="parameters_form" ref="crud" - :page="page" @row-del="parameters_rowDel" @row-update="parameters_rowUpdate" @row-save="parameters_rowSave" @@ -30,11 +29,10 @@ { + document_add(form).then(() => { done(form); this.onLoad(this.page); this.$message({ @@ -722,6 +720,7 @@ }, // 文档清册 编辑按钮处理 document_rowUpdate (form, index, done, loading) { + console.log(form) document_update(form).then(() => { done(form); this.$message({ From 95db529c3ef7ff1b4c62a888e557028b30ee695e Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Mon, 8 Jul 2024 14:07:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=B8=85=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/equipmentledgerDetail.vue | 52 +++++++++++++---------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue index f9f5907..dc5850d 100644 --- a/src/views/leger/equipmentledgerDetail.vue +++ b/src/views/leger/equipmentledgerDetail.vue @@ -20,24 +20,21 @@ ref="crud" @row-del="parameters_rowDel" @row-update="parameters_rowUpdate" - @row-save="parameters_rowSave" - @on-load="onLoad"> + @row-save="parameters_rowSave"> - + @row-del="document_rowDel">
@@ -479,7 +476,7 @@ pagerCount: 5 }, document_data: [], - document_option: { + optionDoc: { align: 'center', menuAlign: 'center', height: 'auto', @@ -546,15 +543,15 @@ label: "附件", prop: "accessory", span: 20, - type: 'upload', - multiple: true, - dataType: "string", - propsHttp: { - url: 'url', - name: 'name', - res: 'data' - }, - action: 'https://api.avuejs.com/imgupload', + // type: 'upload', + + // dataType: "string", + // propsHttp: { + // url: 'url', + // name: 'name', + // res: 'data' + // }, + // action: 'https://api.avuejs.com/imgupload', rules: [{ trigger: "blur" }] @@ -568,7 +565,7 @@ permissionList() { return { addBtn: true, - viewBtn: this.vaildData(this.permission.techparameters_view, false), + viewBtn: false, delBtn: true, editBtn: true }; @@ -653,6 +650,12 @@ }, handleChange (column) { this.type = column + if (column.prop == 'parameters') { + this.parameters_onLoad(); + }if (column.prop == 'document') { + this.document_onLoad(); + } + }, // 技术参数 新增按钮处理 parameters_rowSave (form, done, loading) { @@ -660,7 +663,7 @@ form.eqLedgerId = this.$route.query.id; parameters_add(form).then(() => { done(form); - this.onLoad(this.page); + this.parameters_onLoad(this.page); this.$message({ type: "success", message: "操作成功!" @@ -695,7 +698,7 @@ return parameters_remove(form.id); }) .then(() => { - this.onLoad(this.page); + this.parameters_onLoad(this.page); this.$message({ type: "success", message: "操作成功!" @@ -708,7 +711,7 @@ form.eqLedgerId = this.$route.query.id; document_add(form).then(() => { done(form); - this.onLoad(this.page); + this.document_onLoad(this.page); this.$message({ type: "success", message: "操作成功!" @@ -744,7 +747,7 @@ return document_remove(form.id); }) .then(() => { - this.onLoad(this.page); + this.document_onLoad(this.page); this.$message({ type: "success", message: "操作成功!" @@ -781,12 +784,15 @@ headerClass(){ return 'head-style' }, - onLoad(row, params = {}) { + parameters_onLoad(row, params = {}) { this.loading = true; parameters_getListBylegerId(this.$route.query.id).then(res => { this.parameters_data = res.data.data; this.loading = false; }); + }, + document_onLoad(row, params = {}) { + this.loading = true; document_getListBylegerId(this.$route.query.id).then(res => { this.document_data = res.data.data; this.loading = false; From 7069260a5e2b9a745534db0020e317cccdef67fa Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Mon, 8 Jul 2024 14:13:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=B8=85=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/leger/inventorydocument.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/api/leger/inventorydocument.js b/src/api/leger/inventorydocument.js index c5fa6f5..924c965 100644 --- a/src/api/leger/inventorydocument.js +++ b/src/api/leger/inventorydocument.js @@ -22,7 +22,7 @@ export const getDetail = (id) => { }) } -export const remove = (ids) => { +export const document_remove = (ids) => { return request({ url: '/api/inventorydocument/remove', method: 'post', @@ -32,7 +32,7 @@ export const remove = (ids) => { }) } -export const add = (row) => { +export const document_add = (row) => { return request({ url: '/api/inventorydocument/submit', method: 'post', @@ -40,11 +40,21 @@ export const add = (row) => { }) } -export const update = (row) => { +export const document_update = (row) => { return request({ - url: '/api/inventorydocument/submit', + url: '/api/inventorydocument/update', method: 'post', data: row }) } +export const document_getListBylegerId = (eqLedgerId) => { + return request({ + url: '/api/inventorydocument/getList', + method: 'get', + params: { + eqLedgerId: eqLedgerId + } + }) +} + From f72e98651c508636fd32b321713122409f5ebf90 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Mon, 8 Jul 2024 14:15:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/leger/techparameters.js | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/api/leger/techparameters.js b/src/api/leger/techparameters.js index de45907..df01c75 100644 --- a/src/api/leger/techparameters.js +++ b/src/api/leger/techparameters.js @@ -1,6 +1,6 @@ import request from '@/router/axios'; -export const getList = (current, size, params) => { +export const parameters_getList = (current, size, params) => { return request({ url: '/api/techparameters/list', method: 'get', @@ -12,7 +12,7 @@ export const getList = (current, size, params) => { }) } -export const getDetail = (id) => { +export const parameters_getDetail = (id) => { return request({ url: '/api/techparameters/detail', method: 'get', @@ -22,7 +22,7 @@ export const getDetail = (id) => { }) } -export const remove = (ids) => { +export const parameters_remove = (ids) => { return request({ url: '/api/techparameters/remove', method: 'post', @@ -32,7 +32,7 @@ export const remove = (ids) => { }) } -export const add = (row) => { +export const parameters_add = (row) => { return request({ url: '/api/techparameters/submit', method: 'post', @@ -40,11 +40,22 @@ export const add = (row) => { }) } -export const update = (row) => { +export const parameters_update = (row) => { return request({ - url: '/api/techparameters/submit', + url: '/api/techparameters/update', method: 'post', data: row }) } +export const parameters_getListBylegerId = (eqLedgerId) => { + return request({ + url: '/api/techparameters/getList', + method: 'get', + params: { + eqLedgerId: eqLedgerId + } + }) +} + +