diff --git a/src/api/leger/inspectionstandards.js b/src/api/leger/inspectionstandards.js index de4f7c3..3f7d0ed 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/update', 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/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 2a0347d..257a44c 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/leger/toolinventoryrecord/auditing', + method: 'post', + params: { + ids, + } + }) +} + +export const reject = (ids) => { + return request({ + url: '/api/leger/toolinventoryrecord/reject', + method: 'post', + params: { + ids, + } + }) +} diff --git a/src/views/leger/dynamicledger.vue b/src/views/leger/dynamicledger.vue new file mode 100644 index 0000000..0b1d662 --- /dev/null +++ b/src/views/leger/dynamicledger.vue @@ -0,0 +1,198 @@ + + + + + 查看详情 + + + + + + + + diff --git a/src/views/leger/dynamicledgerDetail.vue b/src/views/leger/dynamicledgerDetail.vue new file mode 100644 index 0000000..e485915 --- /dev/null +++ b/src/views/leger/dynamicledgerDetail.vue @@ -0,0 +1,355 @@ + + + + + + 场站: + + + + + + + KKS编码: + + + + KKS描述: + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/leger/equipmentledger.vue b/src/views/leger/equipmentledger.vue index 8e9dbb6..aa8bace 100644 --- a/src/views/leger/equipmentledger.vue +++ b/src/views/leger/equipmentledger.vue @@ -85,7 +85,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: [ diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue index 8afe879..b28e800 100644 --- a/src/views/leger/equipmentledgerDetail.vue +++ b/src/views/leger/equipmentledgerDetail.vue @@ -870,24 +870,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' diff --git a/src/views/leger/toolinventoryrecord.vue b/src/views/leger/toolinventoryrecord.vue index bcfc3b6..aaacf1d 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,44 @@ icon="el-icon-delete" plain v-if="permission.toolinventoryrecord_delete" - @click="handleDelete">删 除 + @click="handleDelete">批量删除 + + 新增 + + 批量审核 + + 批量驳回 + + 导出 + + + + 查看 + 删除 + diff --git a/src/views/leger/toolinventoryrecordDetail.vue b/src/views/leger/toolinventoryrecordDetail.vue new file mode 100644 index 0000000..6c68547 --- /dev/null +++ b/src/views/leger/toolinventoryrecordDetail.vue @@ -0,0 +1,836 @@ + + + + + + + + + + + + + + + + + + + + + + + {{scope.row.prAccessoryName}} + + + 下 载 + + + + + + + 取消 + + 确定 + + 审核 + + 驳回 + + 修改 + + 删除 + + + + + + +