From 675647a7f016813be01717a2b6b8d3bd15bd46a7 Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Mon, 8 Jul 2024 17:05:17 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=AF=A6=E7=BB=86=20=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/equipmentledgerDetail.vue | 29 +++++++++++++---------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue index ca5e0e9..e8b126f 100644 --- a/src/views/leger/equipmentledgerDetail.vue +++ b/src/views/leger/equipmentledgerDetail.vue @@ -849,24 +849,27 @@ }); }, del() { - remove(this.tab1_form.id()).then(() => { - this.$router.push({ - path: "/leger/equipmentledger", - query: {}, - }); - this.$message({ - type: "success", - message: "操作成功!" - }); - // document_Del(this.tab1_form.eqLedgerId()).then(() => { - // parameters_Del(this.tab1_form.eqLedgerId()); - // }); + this.$confirm("是否将选择数据审核?", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + remove(this.tab1_form.id).then(() => { + this.$router.push({ + path: "/leger/equipmentledger", + query: {}, + }); + this.$message({ + type: "success", + message: "操作成功!" + }); }).catch((error) => { this.$message({ type: "error", message: "操作失败!" }); - }); + }); + }) }, headerClass(){ return 'head-style' From 0131448fb43342e533955f48cf49302db822d55e Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Tue, 9 Jul 2024 15:02:57 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E7=94=BB=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/toolinventoryrecord.vue | 296 +++++++++++++----------- 1 file changed, 162 insertions(+), 134 deletions(-) diff --git a/src/views/leger/toolinventoryrecord.vue b/src/views/leger/toolinventoryrecord.vue index bcfc3b6..dd773d1 100644 --- a/src/views/leger/toolinventoryrecord.vue +++ b/src/views/leger/toolinventoryrecord.vue @@ -6,9 +6,10 @@ :page="page" :permission="permissionList" :before-open="beforeOpen" + :search.sync="search" + :header-cell-class-name="headerClass" v-model="form" ref="crud" - @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @search-change="searchChange" @@ -23,17 +24,43 @@ icon="el-icon-delete" plain v-if="permission.toolinventoryrecord_delete" - @click="handleDelete">删 除 + @click="handleDelete">批量删除 + + From 8fdd66e3fbfd511d9169fb52d915fcc239d156d3 Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Tue, 9 Jul 2024 15:02:58 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E5=88=97=E7=B4=A2?= =?UTF-8?q?=E5=BC=95=E8=A1=A8=E7=A4=BA=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/equipmentledger.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/leger/equipmentledger.vue b/src/views/leger/equipmentledger.vue index 4676d4a..e104241 100644 --- a/src/views/leger/equipmentledger.vue +++ b/src/views/leger/equipmentledger.vue @@ -84,7 +84,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l searchMenuSpan: 6, tip: false, border: true, - index: true, + index: false, viewBtn: true, selection: true, column: [ From e61e4d346c46da11ad2ad1c1c8dd7f73acc26a63 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Tue, 9 Jul 2024 15:03:43 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E7=94=BB=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/leger/toolinventoryrecord.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/api/leger/toolinventoryrecord.js b/src/api/leger/toolinventoryrecord.js index 2a0347d..6931de1 100644 --- a/src/api/leger/toolinventoryrecord.js +++ b/src/api/leger/toolinventoryrecord.js @@ -47,4 +47,23 @@ export const update = (row) => { data: row }) } +export const auditing = (ids) => { + return request({ + url: '/api/toolinventoryrecord/auditing', + method: 'post', + params: { + ids, + } + }) +} + +export const reject = (ids) => { + return request({ + url: '/api/toolinventoryrecord/reject', + method: 'post', + params: { + ids, + } + }) +} From 2e35ad1655149cc39269aeea1f63f9054db2daf8 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Tue, 9 Jul 2024 15:49:31 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=20=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/toolinventoryrecord.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/leger/toolinventoryrecord.vue b/src/views/leger/toolinventoryrecord.vue index dd773d1..2389a6c 100644 --- a/src/views/leger/toolinventoryrecord.vue +++ b/src/views/leger/toolinventoryrecord.vue @@ -97,6 +97,7 @@ { label: "工器具类别", prop: "toolCategory", + search: true, }, { label: "工器具类别描述", @@ -156,7 +157,11 @@ label: "dictValue", value: "dictKey" }, - + }, + { + label: "审核状态", + prop: "check_status", + hide:true, }, ] }, From 2a71507b3663e53192cbd116a98f3fafe0e71188 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Tue, 9 Jul 2024 15:56:39 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=20=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/toolinventoryrecord.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/views/leger/toolinventoryrecord.vue b/src/views/leger/toolinventoryrecord.vue index 2389a6c..9e1ea81 100644 --- a/src/views/leger/toolinventoryrecord.vue +++ b/src/views/leger/toolinventoryrecord.vue @@ -160,8 +160,18 @@ }, { label: "审核状态", - prop: "check_status", + prop: "checkStatus", hide:true, + dicUrl: "/api/daf-system/dict/dictionary?code=check_status", + props: { + label: "dictValue", + value: "dictKey" + }, + rules: [{ + required: true, + message: "请输入审核状态", + trigger: "blur" + }] }, ] }, From a3808ed13b8ccbcdb7ec71b8aa2d1ec02f6818b3 Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Tue, 9 Jul 2024 16:29:17 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/leger/inspectionstandards.js | 38 +- src/views/leger/toolinventoryrecordDetail.vue | 828 ++++++++++++++++++ 2 files changed, 856 insertions(+), 10 deletions(-) create mode 100644 src/views/leger/toolinventoryrecordDetail.vue diff --git a/src/api/leger/inspectionstandards.js b/src/api/leger/inspectionstandards.js index de4f7c3..7ebb892 100644 --- a/src/api/leger/inspectionstandards.js +++ b/src/api/leger/inspectionstandards.js @@ -1,8 +1,8 @@ import request from '@/router/axios'; -export const getList = (current, size, params) => { +export const inspection_getList = (current, size, params) => { return request({ - url: '/api/leger/inspectionstandards/list', + url: '/api/inspectionstandards/list', method: 'get', params: { ...params, @@ -12,9 +12,9 @@ export const getList = (current, size, params) => { }) } -export const getDetail = (id) => { +export const inspection_getDetail = (id) => { return request({ - url: '/api/leger/inspectionstandards/detail', + url: '/api/inspectionstandards/detail', method: 'get', params: { id @@ -22,9 +22,9 @@ export const getDetail = (id) => { }) } -export const remove = (ids) => { +export const inspection_remove = (ids) => { return request({ - url: '/api/leger/inspectionstandards/remove', + url: '/api/inspectionstandards/remove', method: 'post', params: { ids, @@ -32,19 +32,37 @@ export const remove = (ids) => { }) } -export const add = (row) => { +export const inspection_add = (row) => { return request({ - url: '/api/leger/inspectionstandards/submit', + url: '/api/inspectionstandards/submit', method: 'post', data: row }) } -export const update = (row) => { +export const inspection_update = (row) => { return request({ - url: '/api/leger/inspectionstandards/submit', + url: '/api/inspectionstandards/submit', method: 'post', data: row }) } +export const inspection_getListBylegerId = (toolsCodeId) => { + return request({ + url: '/api/inspectionstandards/getList', + method: 'get', + params: { + toolsCodeId: toolsCodeId + } + }) +} +export const inspection__Del = (toolsCodeId) => { + return request({ + url: '/api/inspectionstandards/del', + method: 'post', + params: { + toolsCodeId: toolsCodeId + } + }) +} diff --git a/src/views/leger/toolinventoryrecordDetail.vue b/src/views/leger/toolinventoryrecordDetail.vue new file mode 100644 index 0000000..d308917 --- /dev/null +++ b/src/views/leger/toolinventoryrecordDetail.vue @@ -0,0 +1,828 @@ + + + From a2893c852014ca02a79c59dce01aac8a3ce40f38 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Tue, 9 Jul 2024 16:59:48 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/dynamicledger.vue | 196 +++++++++++++++ src/views/leger/dynamicledgerDetail.vue | 322 ++++++++++++++++++++++++ 2 files changed, 518 insertions(+) create mode 100644 src/views/leger/dynamicledger.vue create mode 100644 src/views/leger/dynamicledgerDetail.vue diff --git a/src/views/leger/dynamicledger.vue b/src/views/leger/dynamicledger.vue new file mode 100644 index 0000000..966859c --- /dev/null +++ b/src/views/leger/dynamicledger.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/src/views/leger/dynamicledgerDetail.vue b/src/views/leger/dynamicledgerDetail.vue new file mode 100644 index 0000000..cbde1ce --- /dev/null +++ b/src/views/leger/dynamicledgerDetail.vue @@ -0,0 +1,322 @@ + + + From c6fd1eb60714116339b220f89148ddc1ad87f06f Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Wed, 10 Jul 2024 10:58:00 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/dynamicledger.vue | 4 ++- src/views/leger/dynamicledgerDetail.vue | 45 +++++++++++++++++++++---- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/src/views/leger/dynamicledger.vue b/src/views/leger/dynamicledger.vue index 966859c..0b1d662 100644 --- a/src/views/leger/dynamicledger.vue +++ b/src/views/leger/dynamicledger.vue @@ -46,7 +46,9 @@ export default { height: 'auto', calcHeight: 210, searchShow: true, - searchMenuSpan: 6, + searchMenuSpan: 22, + searchBtnText: '查询', + emptyBtnText: '重置', tip: false, border: true, indexLabel: "序号", diff --git a/src/views/leger/dynamicledgerDetail.vue b/src/views/leger/dynamicledgerDetail.vue index cbde1ce..e485915 100644 --- a/src/views/leger/dynamicledgerDetail.vue +++ b/src/views/leger/dynamicledgerDetail.vue @@ -2,14 +2,34 @@ @@ -77,7 +97,20 @@ export default { name: "dynamicledgerDetail", data () { return { - stationValue:this.$route.query.station, + stationValue: this.$route.query.station, + options: [{ + value: 1, + label: '景和光伏' + }, { + value: 2, + label: '北沙一光伏' + }, { + value: 3, + label: '北沙二光伏' + }, { + value: 4, + label: '达坂城风电一场' + }], kksEncodingValue:this.$route.query.kksEncoding, kksDesValue:this.$route.query.kksDescription, frame_class: '', From 5086f6503ca71546ebc73fd2b6033c9a221dd5dd Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Wed, 10 Jul 2024 13:27:40 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/leger/inspectionstandards.js | 4 +- src/api/leger/inventorydocument.js | 12 ++++- src/api/leger/techparameters.js | 11 +++++ src/api/leger/toolinventoryrecord.js | 4 +- src/views/leger/toolinventoryrecord.vue | 2 +- src/views/leger/toolinventoryrecordDetail.vue | 44 +++++++++++-------- 6 files changed, 53 insertions(+), 24 deletions(-) diff --git a/src/api/leger/inspectionstandards.js b/src/api/leger/inspectionstandards.js index 7ebb892..3f7d0ed 100644 --- a/src/api/leger/inspectionstandards.js +++ b/src/api/leger/inspectionstandards.js @@ -42,7 +42,7 @@ export const inspection_add = (row) => { export const inspection_update = (row) => { return request({ - url: '/api/inspectionstandards/submit', + url: '/api/inspectionstandards/update', method: 'post', data: row }) @@ -57,7 +57,7 @@ export const inspection_getListBylegerId = (toolsCodeId) => { }) } -export const inspection__Del = (toolsCodeId) => { +export const inspection_Del = (toolsCodeId) => { return request({ url: '/api/inspectionstandards/del', method: 'post', diff --git a/src/api/leger/inventorydocument.js b/src/api/leger/inventorydocument.js index 3305394..59b2d13 100644 --- a/src/api/leger/inventorydocument.js +++ b/src/api/leger/inventorydocument.js @@ -48,7 +48,17 @@ export const document_update = (row) => { }) } -export const document_getListBylegerId = (eqLedgerId) => { +export const document_getListBylegerId = (toolsCodeId) => { + return request({ + url: '/api/inventorydocument/getList', + method: 'get', + params: { + toolsCodeId: toolsCodeId + } + }) +} + +export const document_tools_getListBylegerId = (eqLedgerId) => { return request({ url: '/api/inventorydocument/getList', method: 'get', diff --git a/src/api/leger/techparameters.js b/src/api/leger/techparameters.js index 4da10d2..86fe70a 100644 --- a/src/api/leger/techparameters.js +++ b/src/api/leger/techparameters.js @@ -58,6 +58,16 @@ export const parameters_getListBylegerId = (eqLedgerId) => { }) } +export const parameters_tools_getListBylegerId = (toolsCodeId) => { + return request({ + url: '/api/techparameters/getList', + method: 'get', + params: { + toolsCodeId: toolsCodeId + } + }) +} + export const parameters_Del = (eqLedgerId) => { return request({ url: '/api/techparameters/del', @@ -68,3 +78,4 @@ export const parameters_Del = (eqLedgerId) => { }) } + diff --git a/src/api/leger/toolinventoryrecord.js b/src/api/leger/toolinventoryrecord.js index 6931de1..257a44c 100644 --- a/src/api/leger/toolinventoryrecord.js +++ b/src/api/leger/toolinventoryrecord.js @@ -49,7 +49,7 @@ export const update = (row) => { } export const auditing = (ids) => { return request({ - url: '/api/toolinventoryrecord/auditing', + url: '/api/leger/toolinventoryrecord/auditing', method: 'post', params: { ids, @@ -59,7 +59,7 @@ export const auditing = (ids) => { export const reject = (ids) => { return request({ - url: '/api/toolinventoryrecord/reject', + url: '/api/leger/toolinventoryrecord/reject', method: 'post', params: { ids, diff --git a/src/views/leger/toolinventoryrecord.vue b/src/views/leger/toolinventoryrecord.vue index 9e1ea81..aaacf1d 100644 --- a/src/views/leger/toolinventoryrecord.vue +++ b/src/views/leger/toolinventoryrecord.vue @@ -61,6 +61,7 @@ import {getList, getDetail, add, remove, reject, auditing} from "@/api/leger/toolinventoryrecord"; import {mapGetters} from "vuex"; import {getToken} from "@/util/auth"; + import {Alert} from "element-ui"; export default { data() { return { @@ -241,7 +242,6 @@ }, // 查看操作处理 handleDetailSearch(row) { - debugger this.$router.push({ path: "/leger/toolinventoryrecordDetail", query: { diff --git a/src/views/leger/toolinventoryrecordDetail.vue b/src/views/leger/toolinventoryrecordDetail.vue index d308917..6c68547 100644 --- a/src/views/leger/toolinventoryrecordDetail.vue +++ b/src/views/leger/toolinventoryrecordDetail.vue @@ -101,7 +101,7 @@