From 99087c671bdace7e5186a84c0e92239b4f121478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
<411641505@qq.com>
Date: Tue, 10 Oct 2023 18:16:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?=
=?UTF-8?q?=E5=92=8C=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E7=9A=84=E6=A3=80?=
=?UTF-8?q?=E9=AA=8C=E5=8D=95=E7=A7=BB=E5=8A=A8=E5=88=B0=E8=A1=8C=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/wm/itemrecpt/index.vue | 12 ++----
src/views/mes/wm/itemrecpt/line.vue | 53 ++++++++++++++++++++++++-
src/views/mes/wm/productsalse/index.vue | 14 ++-----
src/views/mes/wm/productsalse/line.vue | 53 ++++++++++++++++++++++++-
4 files changed, 109 insertions(+), 23 deletions(-)
diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue
index 638d168..4bcdc27 100644
--- a/src/views/mes/wm/itemrecpt/index.vue
+++ b/src/views/mes/wm/itemrecpt/index.vue
@@ -105,7 +105,6 @@
-
@@ -210,14 +209,6 @@
-
-
-
-
-
-
-
-
@@ -236,6 +227,9 @@
+
+
+
diff --git a/src/views/mes/wm/itemrecpt/line.vue b/src/views/mes/wm/itemrecpt/line.vue
index e870ad8..de6f6f5 100644
--- a/src/views/mes/wm/itemrecpt/line.vue
+++ b/src/views/mes/wm/itemrecpt/line.vue
@@ -41,6 +41,12 @@
{{ parseTime(scope.row.expireDate, '{y}-{m}-{d}') }}
+
+
+
+
+
+
-
+
+
+
+
+ {{dict.label}}
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+
+
@@ -145,10 +178,12 @@
From cd1a8b30a8d0d2bec50c5e7cb7e6969610ab746d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
<411641505@qq.com>
Date: Mon, 16 Oct 2023 11:17:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/cal/plan/index.vue | 2 +-
src/views/mes/cal/plan/shift.vue | 4 ++--
src/views/mes/cal/plan/team.vue | 2 +-
src/views/mes/cal/team/index.vue | 12 ++++++------
src/views/mes/cal/team/member.vue | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/mes/cal/plan/index.vue b/src/views/mes/cal/plan/index.vue
index a1c2e22..2fc18f3 100644
--- a/src/views/mes/cal/plan/index.vue
+++ b/src/views/mes/cal/plan/index.vue
@@ -91,7 +91,7 @@
{{scope.row.planCode}}
diff --git a/src/views/mes/cal/plan/shift.vue b/src/views/mes/cal/plan/shift.vue
index 0587c15..c81211d 100644
--- a/src/views/mes/cal/plan/shift.vue
+++ b/src/views/mes/cal/plan/shift.vue
@@ -52,14 +52,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['cal:shift:edit']"
+ v-hasPermi="['mes:cal:shift:edit']"
>修改
删除
diff --git a/src/views/mes/cal/plan/team.vue b/src/views/mes/cal/plan/team.vue
index 65dd7d5..1469cfa 100644
--- a/src/views/mes/cal/plan/team.vue
+++ b/src/views/mes/cal/plan/team.vue
@@ -18,7 +18,7 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['mes:cal:plan:edit']"
+ v-hasPermi="['mes:cal:calplan:edit']"
>删除
diff --git a/src/views/mes/cal/team/index.vue b/src/views/mes/cal/team/index.vue
index 5130b52..53de664 100644
--- a/src/views/mes/cal/team/index.vue
+++ b/src/views/mes/cal/team/index.vue
@@ -41,7 +41,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['cal:team:add']"
+ v-hasPermi="['mes:cal:team:add']"
>新增
@@ -52,7 +52,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['cal:team:edit']"
+ v-hasPermi="['mes:cal:team:edit']"
>修改
@@ -63,7 +63,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['cal:team:remove']"
+ v-hasPermi="['mes:cal:team:remove']"
>删除
@@ -73,7 +73,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['cal:team:export']"
+ v-hasPermi="['mes:cal:team:export']"
>导出
@@ -104,14 +104,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['cal:team:edit']"
+ v-hasPermi="['mes:cal:team:edit']"
>修改
删除
diff --git a/src/views/mes/cal/team/member.vue b/src/views/mes/cal/team/member.vue
index bffd73a..8a0b2c3 100644
--- a/src/views/mes/cal/team/member.vue
+++ b/src/views/mes/cal/team/member.vue
@@ -48,7 +48,7 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['cal:teammember:remove']"
+ v-hasPermi="['mes:cal:team:remove']"
>删除