From 2518e47a3ac999978fbf14612c967c3bbf421d25 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 17 十一月 2023 13:31:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/manufacturingorder/index.vue | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 7ba7935..2f08f2a 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -22,6 +22,7 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="item"
:command="item.command"
v-for="item in taskTypeArr"
:disabled="canCreateTask"
@@ -40,6 +41,7 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="item"
:command="item.command"
v-for="item in stateTagArr"
:disabled="item.disabled"
@@ -53,19 +55,19 @@
@command="issueMaterialHandleCommand"
style="margin-left:10px;"
>
- <el-button>
+ <!-- <el-button>
鍙戞枡<i class="el-icon-arrow-down el-icon--right"></i>
- </el-button>
- <el-dropdown-menu slot="dropdown">
+ </el-button> -->
+ <!-- <el-dropdown-menu slot="dropdown">
<el-dropdown-item
:command="item.command"
v-for="item in issueMaterialArr"
:disabled="item.disabled"
>{{ item.label }}</el-dropdown-item
>
- </el-dropdown-menu>
+ </el-dropdown-menu> -->
</el-dropdown>
- <el-button
+ <!-- <el-button
v-if="permissions.manufacturingorder_orderto_ifs"
@click="commitOrderIfs()"
type="primary"
@@ -88,7 +90,7 @@
style="margin-left:10px;"
:loading="loadingStructIfs"
>鐗╂枡鍚屾ERP
- </el-button>
+ </el-button> -->
<el-button
v-if="permissions.manufacturingorder_refresh_ifsorder"
@click="refreshIfsorder()"
@@ -230,7 +232,7 @@
taskTypeArr: [],
stateTagArr: [
{
- label: '宸茶鍒�',
+ label: '寰呬笅杈�',
command: 'PLAN',
disabled: false,
permitArr: ['03completed', '04canceled']
@@ -269,7 +271,7 @@
}
],
states: [
- { value: '01planned', label: '宸茶鍒�' },
+ { value: '01planned', label: '寰呬笅杈�' },
{ value: '02issued', label: '宸蹭笅杈�' },
{
value: '03completed',
@@ -408,24 +410,24 @@
isSearch: true,
searchInfoType: 'text'
},
- {
- minWidth: '120',
- prop: 'printRequirement',
- label: '鍗板瓧瑕佹眰',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- {
- minWidth: '120',
- prop: 'lengthRequirement',
- label: '鐩橀暱瑕佹眰',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'printRequirement',
+ // label: '鍗板瓧瑕佹眰',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // {
+ // minWidth: '120',
+ // prop: 'lengthRequirement',
+ // label: '鐩橀暱瑕佹眰',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
{
minWidth: '120',
prop: 'orderRemark',
--
Gitblit v1.9.3