diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue index fd303d9..d072781 100644 --- a/src/views/mes/pro/feedback/index.vue +++ b/src/views/mes/pro/feedback/index.vue @@ -297,8 +297,8 @@ 返回 保 存 提交审批 - 审批通过 - 审批不通过 + 审批通过 + 审批不通过 取 消 @@ -311,12 +311,14 @@ import WorkorderSelect from "@/components/workorderSelect/single.vue" import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue" import UserSingleSelect from "@/components/userSelect/single.vue" import ProtaskSelect from "@/components/TaskSelect/taskSelectSingle.vue" +import {getUserProfile} from "@/api/system/user"; export default { name: "Feedback", components: {WorkorderSelect,WorkstationSelect,UserSingleSelect,ProtaskSelect}, dicts: ['mes_order_status', 'mes_feedback_type'], data() { return { + user: {}, // 当前登录用户 optType: undefined, // 遮罩层 loading: true, @@ -393,6 +395,9 @@ export default { }, created() { this.getList(); + getUserProfile().then(response => { + this.user = response.data; + }); }, methods: { /** 查询生产报工记录列表 */ diff --git a/src/views/mes/wm/issue/index.vue b/src/views/mes/wm/issue/index.vue index 35414f7..3a1d88e 100644 --- a/src/views/mes/wm/issue/index.vue +++ b/src/views/mes/wm/issue/index.vue @@ -221,13 +221,13 @@ - + - + diff --git a/src/views/mes/wm/itemrecpt/line.vue b/src/views/mes/wm/itemrecpt/line.vue index 6954f3d..48ffa41 100644 --- a/src/views/mes/wm/itemrecpt/line.vue +++ b/src/views/mes/wm/itemrecpt/line.vue @@ -316,6 +316,7 @@ export default { updateBy: null, updateTime: null }; + this.$set(this, "warehouseInfo", []) this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -339,9 +340,11 @@ export default { this.reset(); this.warehouseInfo = []; if(this.warehouseId != null){ - this.warehouseInfo[0] = this.warehouseId; - this.warehouseInfo[1] = this.locationId; - this.warehouseInfo[2] = this.areaId; + let tempList = [] + tempList.push(this.warehouseId) + tempList.push(this.locationId) + tempList.push(this.areaId) + this.$set(this, "warehouseInfo", tempList) } this.open = true; this.title = "添加物料入库单行"; @@ -352,9 +355,11 @@ export default { const lineId = row.lineId || this.ids getItemrecptline(lineId).then(response => { this.form = response.data; - this.warehouseInfo[0] = response.data.warehouseId; - this.warehouseInfo[1] = response.data.locationId; - this.warehouseInfo[2] = response.data.areaId; + let tempList = [] + tempList.push(response.data.warehouseId) + tempList.push(response.data.locationId) + tempList.push(response.data.areaId) + this.$set(this, "warehouseInfo", tempList) this.open = true; this.title = "修改物料入库单行"; }); diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue index 8e33fdc..890f4f4 100644 --- a/src/views/mes/wm/productrecpt/index.vue +++ b/src/views/mes/wm/productrecpt/index.vue @@ -430,7 +430,7 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const recptIds = row.recptId || this.ids; - this.$modal.confirm('是否确认删除产品入库单编号为"' + recptIds + '"的数据项?').then(function() { + this.$modal.confirm('是否确认删除产品入库单编号为"' + row.recptCode + '"的数据项?').then(function() { return delProductrecpt(recptIds); }).then(() => { this.getList(); diff --git a/src/views/mes/wm/rtvendor/index.vue b/src/views/mes/wm/rtvendor/index.vue index 0a862dc..90e6d0e 100644 --- a/src/views/mes/wm/rtvendor/index.vue +++ b/src/views/mes/wm/rtvendor/index.vue @@ -430,7 +430,7 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const rtIds = row.rtId || this.ids; - this.$modal.confirm('是否确认删除供应商退货编号为"' + rtIds + '"的数据项?').then(function() { + this.$modal.confirm('是否确认删除供应商退货编号为"' + row.rtCode + '"的数据项?').then(function() { return delRtvendor(rtIds); }).then(() => { this.getList();