From 2011f278d3d1437fd907c63f1e6b1e9b54fb24de Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 13 May 2024 15:40:28 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=8D=E5=B1=95?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../initialContainerMainRequest/index.vue | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index dadb6ac5c..576fe1137 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -33,8 +33,8 @@
{{ row.number }}
-
-
+
+
@@ -228,7 +228,14 @@ const buttonBaseClick = (val, item) => {
console.log('其他按钮', item)
}
}
-
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+ if (val.indexOf(row.status) > -1) {
+ return false
+ } else {
+ return true
+ }
+}
// 列表-操作按钮
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
From 80aeb92ea89a8db91b2fcbfed2b9d9138d7048a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Mon, 13 May 2024 16:42:27 +0800
Subject: [PATCH 2/5] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/disposition/defaultButtons.ts | 3 +-
src/views/qms/inspectionJob/addForm.vue | 1454 +++++++++++++----------
2 files changed, 802 insertions(+), 655 deletions(-)
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 1d967ae75..408141d1d 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -193,8 +193,7 @@ export function formStagingBtn(option:any) {
label: t(`btn.暂存`).replace('btn.', ''),
name: 'staging',
hide: false,
-
- color: '',
+ color: 'green',
float:'right',
hasPermi: ''
})
diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 0814259de..6fc8fc810 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -1,13 +1,17 @@
-