From c29497849232a01ce25037902d0825d891fa5f5d Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Tue, 24 Dec 2024 15:10:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=94=9F=E4=BA=A7=E6=8A=A5?=
=?UTF-8?q?=E5=B7=A5=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E8=BF=87=E6=BB=A4=E3=80=82=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?=
=?UTF-8?q?=E4=B8=AD=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E5=85=A5=E5=BA=93?=
=?UTF-8?q?=E6=9C=AA=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
=?UTF-8?q?=E3=80=82=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=E3=80=82=E4=BE=9B=E5=BA=94=E5=95=86=E9=80=80?=
=?UTF-8?q?=E8=B4=A7=E5=92=8C=E4=BA=A7=E5=93=81=E5=85=A5=E5=BA=93=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/pro/feedback/index.vue | 9 +++++++--
src/views/mes/wm/issue/index.vue | 4 ++--
src/views/mes/wm/itemrecpt/line.vue | 17 +++++++++++------
src/views/mes/wm/productrecpt/index.vue | 2 +-
src/views/mes/wm/rtvendor/index.vue | 2 +-
5 files changed, 22 insertions(+), 12 deletions(-)
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();