diff --git a/src/api/mes/md/baseKnife.js b/src/api/mes/md/baseKnife.js index 7a47c2b..509572e 100644 --- a/src/api/mes/md/baseKnife.js +++ b/src/api/mes/md/baseKnife.js @@ -50,3 +50,12 @@ export function resetBaseKnife(baseKnifeId) { method: 'put' }) } + +// 重置工具台账寿命 +export function submitZdTask(data) { + return request({ + url: '/mes/md/baseKnife/zdTask', + method: 'put', + data: data + }) +} diff --git a/src/api/mes/wm/zdTask.js b/src/api/mes/wm/zdTask.js new file mode 100644 index 0000000..ec2c0e2 --- /dev/null +++ b/src/api/mes/wm/zdTask.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询组装任务列表 +export function listZdTask(query) { + return request({ + url: '/mes/wm/zdTask/list', + method: 'get', + params: query + }) +} + +// 查询组装任务详细 +export function getZdTask(wmsZdTaskId) { + return request({ + url: '/mes/wm/zdTask/' + wmsZdTaskId, + method: 'get' + }) +} + +// 新增组装任务 +export function addZdTask(data) { + return request({ + url: '/mes/wm/zdTask', + method: 'post', + data: data + }) +} + +// 修改组装任务 +export function updateZdTask(data) { + return request({ + url: '/mes/wm/zdTask', + method: 'put', + data: data + }) +} + +// 删除组装任务 +export function delZdTask(wmsZdTaskId) { + return request({ + url: '/mes/wm/zdTask/' + wmsZdTaskId, + method: 'delete' + }) +} diff --git a/src/router/index.js b/src/router/index.js index c58803a..8327082 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -134,20 +134,6 @@ export const dynamicRoutes = [ } ] }, - { - path: '/wm/ctBase-data', - component: Layout, - hidden: true, - permissions: ['system:ctBase:list'], - children: [ - { - path: 'index/:ctBaseId(\\d+)', - component: () => import('@/views/mes/wm/ctBase/data'), - name: 'Data', - meta: { title: '料箱数据', activeMenu: '/mes/wm/ctBase' } - } - ] - }, { path: '/system/autocodePart', component: Layout, diff --git a/src/views/mes/md/baseKnife/index.vue b/src/views/mes/md/baseKnife/index.vue index 65e2b9d..a6ceaf9 100644 --- a/src/views/mes/md/baseKnife/index.vue +++ b/src/views/mes/md/baseKnife/index.vue @@ -206,7 +206,7 @@ export default { }, /** 重置按钮操作 */ handleReset(row) { - this.$modal.confirm('是否确认重置编码为"' + row.knifeCode + '"的寿命？').then(function() { + this.$modal.confirm('当前寿命为 [ ' + row.knifeLife + ' ], 是否确认重置编码为"' + row.knifeCode + '"的寿命？').then(function() { return resetBaseKnife(row.baseKnifeId); }).then(() => { this.getList(); diff --git a/src/views/mes/wm/ctBase/data.vue b/src/views/mes/wm/ctBase/data.vue deleted file mode 100644 index 93d6c28..0000000 --- a/src/views/mes/wm/ctBase/data.vue +++ /dev/null @@ -1,399 +0,0 @@ - - - diff --git a/src/views/mes/wm/ctBase/index.vue b/src/views/mes/wm/ctBase/index.vue index 8e140f8..8d9efff 100644 --- a/src/views/mes/wm/ctBase/index.vue +++ b/src/views/mes/wm/ctBase/index.vue @@ -110,7 +110,7 @@ /> - + @@ -133,6 +133,54 @@ + 物料台账信息 + + + 添加 + + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + +
确 定 @@ -185,13 +233,50 @@ export default { type: [ { required: true, message: "请选择料箱状态", trigger: "blur" } ] - } + }, + baseKnifeList: [], + checkedBaseKnife: [], }; }, created() { this.getList(); }, methods: { + handleAddBaseKnife() { + let obj = {}; + obj.mdItemId = ""; + obj.mdItemName = ""; + obj.mdItemCode = ""; + obj.mdItemUnit = ""; + obj.standardDosage = ""; + obj.remark = ""; + this.baseKnifeList.push(obj); + }, + handleDeleteBaseKnife() { + if (this.checkedBaseKnife.length == 0) { + this.$modal.msgError("请先选择要删除的物料台账数据"); + } else { + const baseKnifeList = this.baseKnifeList; + const checkedBaseKnife = this.checkedBaseKnife; + this.baseKnifeList = baseKnifeList.filter(function (item) { + return checkedBaseKnife.indexOf(item.index) == -1 + }); + } + }, + onChildItemSelected(obj) { + debugger; + if (obj != undefined && obj != null && this.nowChildItemIndex != null) { + this.baseKnifeList[this.nowChildItemIndex].mdItemId = obj.itemId; + this.baseKnifeList[this.nowChildItemIndex].mdItemCode = obj.itemCode; + this.baseKnifeList[this.nowChildItemIndex].mdItemName = obj.itemName; + this.baseKnifeList[this.nowChildItemIndex].mdItemUnit = obj.unitOfMeasure; + this.nowChildItemIndex = null; + } + }, + handleSelectChildItem(index) { + this.nowChildItemIndex = index - 1; + this.$refs.childItemSelect.showFlag = true; + }, /** 查询料箱管理列表 */ getList() { this.loading = true; @@ -213,6 +298,8 @@ export default { code: null, type: null, }; + this.mbbProduBomList = []; + this.checkedBaseKnife = []; this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -245,6 +332,7 @@ export default { this.form = response.data; this.open = true; this.title = "修改料箱管理"; + }); }, /** 提交按钮 */ diff --git a/src/views/mes/wm/zdTask/index.vue b/src/views/mes/wm/zdTask/index.vue new file mode 100644 index 0000000..cbe6835 --- /dev/null +++ b/src/views/mes/wm/zdTask/index.vue @@ -0,0 +1,360 @@ + + +