diff --git a/src/api/toolsManage/index.js b/src/api/toolsManage/index.js index b714fe16..a9d40e0e 100644 --- a/src/api/toolsManage/index.js +++ b/src/api/toolsManage/index.js @@ -125,3 +125,21 @@ export const getListEncodingApi = (data = {}) => { params: data, }) } + +// 编码工具管理-列表 +export const getListCodeApi = (data = {}) => { + return request({ + url: '/material-mall/toolLedger/listCode', + method: 'GET', + params: data, + }) +} + +// 编码工具管理-编辑 +export const updateByIdApi = (data = {}) => { + return request({ + url: '/material-mall/toolLedger/updateById', + method: 'POST', + data: data, + }) +} diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index ee543fc4..b6f79aaa 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -32,7 +32,7 @@ {{ getFileName(file.name) }}
- 删除 + 删除
@@ -66,6 +66,10 @@ export default { isShowTip: { type: Boolean, default: true + }, + isView: { + type: Boolean, + default: false } }, data() { diff --git a/src/views/toolsManage/codeToolsLedger/index.vue b/src/views/toolsManage/codeToolsLedger/index.vue index 2ec9e322..d898036b 100644 --- a/src/views/toolsManage/codeToolsLedger/index.vue +++ b/src/views/toolsManage/codeToolsLedger/index.vue @@ -1,39 +1,74 @@ - + @@ -133,8 +144,8 @@ export default { applyId: null, }, typeList: [ - { label: '数量管理', value: '0' }, - { label: '编码管理', value: '1' }, + { label: '数量管理', value: '1' }, + { label: '编码管理', value: '0' }, ], total: 0, // 总条数 // 表头 @@ -250,7 +261,7 @@ export default { type: 'success', message: '操作成功!', }) - if (showAll) { + if (this.showAll) { this.getList() } else { this.$tab.closeOpenPage({ path: '/toolsManage/approveList' }) diff --git a/src/views/toolsManage/toolsLedger/index.vue b/src/views/toolsManage/toolsLedger/index.vue index 440a3106..ec4a7a50 100644 --- a/src/views/toolsManage/toolsLedger/index.vue +++ b/src/views/toolsManage/toolsLedger/index.vue @@ -230,74 +230,74 @@ export default { { label: '规格型号', prop: 'typeName' }, { label: '在库数量', - prop: 'stockQuantity', + prop: 'availableNum', render: (h, { row }) => { - return row.manageType == 1 && row.stockQuantity > 0 + return row.manageMode == 0 && row.availableNum > 0 ? h( 'span', { style: { color: '#409EFF', cursor: 'pointer' }, - on: { click: () => this.handleDialog(row, 'out') }, + on: { click: () => this.handleDialog(row, '0') }, }, - row.stockQuantity, + row.availableNum, ) - : h('span', {}, row.stockQuantity) + : h('span', {}, row.availableNum) }, }, { label: '自用数量', - prop: 'selfUseQuantity', + prop: 'inNum', render: (h, { row }) => { - return row.selfUseQuantity > 0 + return row.inNum > 0 ? h( 'span', { style: { color: '#409EFF', cursor: 'pointer' }, on: { click: () => this.handleDialog(row, '1') }, }, - row.selfUseQuantity, + row.inNum, ) - : h('span', {}, row.selfUseQuantity) + : h('span', {}, row.inNum) }, }, { label: '共享数量', - prop: 'shareQuantity', + prop: 'scrapNum', render: (h, { row }) => { - return row.shareQuantity > 0 + return row.scrapNum > 0 ? h( 'span', { style: { color: '#409EFF', cursor: 'pointer' }, on: { click: () => this.handleDialog(row, '1') }, }, - row.shareQuantity, + row.scrapNum, ) - : h('span', {}, row.shareQuantity) + : h('span', {}, row.scrapNum) }, }, { label: '在修数量', - prop: 'repairingQuantity', + prop: 'repairNum', render: (h, { row }) => { - return row.manageType == 1 && row.repairingQuantity > 0 + return row.manageMode == 0 && row.repairNum > 0 ? h( 'span', { style: { color: '#409EFF', cursor: 'pointer' }, - on: { click: () => this.handleDialog(row, '1') }, + on: { click: () => this.handleDialog(row, '0') }, }, - row.repairingQuantity, + row.repairNum, ) - : h('span', {}, row.repairingQuantity) + : h('span', {}, row.repairNum) }, }, - { label: '工具总数', prop: 'count' }, + { label: '工具总数', prop: 'totalNum' }, { label: '管理模式', - prop: 'manageType', + prop: 'manageMode', render: (h, { row }) => { - return row.manageType == '0' ? h('span', {}, '数量管理') : h('span', {}, '编码管理') + return row.manageMode == '1' ? h('span', {}, '数量管理') : h('span', {}, '编码管理') }, }, ], @@ -401,8 +401,16 @@ export default { this.getSelectList() }, handleDialog(row, type) { - this.dialogTitle = type == 'out' ? '出库详情' : '入库详情' - this.isOut = type == 'out' ? true : false + console.log('🚀 ~ type:', type == 0) + this.dialogTitle = '工具详情' + if (type == 0) { + this.dialogColumns = this.dialogColumns.filter(item => item.prop != 'proName') + console.log('🚀 ~ this.dialogColumns:', this.dialogColumns) + } else { + if (!this.dialogColumns.some(item => item.prop == 'proName')) { + this.dialogColumns.push({ label: '所在工程', prop: 'proName' }) + } + } this.dialogVisible = true this.dialogList = [] setTimeout(() => {