From 4bf457a5c8433c9ec6f0ec86b2c1c20c5e667391 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 16 十一月 2023 20:22:21 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/plan/operationtask/index.vue | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/src/views/plan/operationtask/index.vue b/src/views/plan/operationtask/index.vue
index c4c89b8..15f019c 100644
--- a/src/views/plan/operationtask/index.vue
+++ b/src/views/plan/operationtask/index.vue
@@ -21,6 +21,7 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="item"
:command="item.command"
v-for="item in stateTagArr"
:disabled="item.disabled"
@@ -36,15 +37,24 @@
>
鍚堝苟宸ュ崟
</el-button>
+ <el-button style="margin-left:10px" @click="openTaskOrder">
+ 浼樺厛绾�
+ </el-button>
<el-button
+ type="primary"
v-if="permissions.operationtask_pallet_transport"
style="margin-left:10px"
@click="openTaskMaterial"
>
- 璐х洏杩愯緭
+ 鎵撳嵃妯″叿棰嗙敤娓呭崟
</el-button>
- <el-button style="margin-left:10px" @click="openTaskOrder">
- 浼樺厛绾�
+ <el-button
+ type="primary"
+ v-if="permissions.operationtask_pallet_transport"
+ style="margin-left:10px"
+ @click="openTaskMaterial"
+ >
+ 鎵撳嵃鐗╂枡棰嗙敤娓呭崟
</el-button>
</template>
</ttable>
@@ -379,24 +389,24 @@
isSearch: true,
searchInfoType: 'text'
},
- {
- minWidth: '120',
- prop: 'discNum',
- label: '鐩樻暟',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- {
- minWidth: '120',
- prop: 'reelSpec',
- label: '杞藉叿瑙勬牸',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'discNum',
+ // label: '鐩樻暟',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // {
+ // minWidth: '120',
+ // prop: 'reelSpec',
+ // label: '杞藉叿瑙勬牸',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
{
width: '130',
prop: 'ratio',
--
Gitblit v1.9.3