From f19edc96af3261347f48cb8f66f1f5b2feb6071e Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 17 十一月 2023 16:43:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/plan/manufacturingorder/index.vue | 192 ++++++++++++++++++++++++------------------------
1 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 7ba7935..d90208e 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -22,8 +22,9 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="index"
:command="item.command"
- v-for="item in taskTypeArr"
+ v-for="(item,index) in taskTypeArr"
:disabled="canCreateTask"
>{{ item.label }}</el-dropdown-item
>
@@ -40,32 +41,33 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="index"
:command="item.command"
- v-for="item in stateTagArr"
+ v-for="(item,index) in stateTagArr"
:disabled="item.disabled"
>{{ item.label }}</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
- <el-dropdown
+ <!-- <el-dropdown
v-if="permissions.manufacturingorder_issue_material"
@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>
- <el-button
+ </el-dropdown-menu> -->
+ <!-- </el-dropdown> -->
+ <!-- <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',
@@ -324,7 +326,7 @@
sort: true,
isTrue: true,
formatter: this.formatState,
- propVal: '01planned',
+ // propVal: '01planned',
isSearch: true,
searchInfoType: 'select',
optList: () => {
@@ -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',
@@ -490,27 +492,25 @@
isSearch: true,
searchInfoType: 'text'
},
+ // {
+ // minWidth: '120',
+ // prop: 'outerColor',
+ // label: '澶栨姢棰滆壊',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
- {
- minWidth: '120',
- prop: 'outerColor',
- label: '澶栨姢棰滆壊',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
-
- {
- minWidth: '120',
- prop: 'insulationColor',
- label: '缁濈紭棰滆壊',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
-
+ // {
+ // minWidth: '120',
+ // prop: 'insulationColor',
+ // label: '缁濈紭棰滆壊',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
{
minWidth: '120',
prop: 'qtyRequired',
@@ -630,42 +630,42 @@
isSearch: true,
searchInfoType: 'text'
},
- {
- minWidth: '100',
- prop: 'oriIfsOrderNo',
- label: '鍘烮FS璁㈠崟鍙�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- {
- minWidth: '100',
- prop: 'ifsOrderNo',
- label: 'IFS璁㈠崟鍙�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- {
- minWidth: '100',
- prop: 'ifsReleaseNo',
- label: 'IFS涓嬭揪鍙�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- {
- minWidth: '100',
- prop: 'ifsSequenceNo',
- label: 'IFS搴忓垪鍙�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '100',
+ // prop: 'oriIfsOrderNo',
+ // label: '鍘烮FS璁㈠崟鍙�',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // {
+ // minWidth: '100',
+ // prop: 'ifsOrderNo',
+ // label: 'IFS璁㈠崟鍙�',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // {
+ // minWidth: '100',
+ // prop: 'ifsReleaseNo',
+ // label: 'IFS涓嬭揪鍙�',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // {
+ // minWidth: '100',
+ // prop: 'ifsSequenceNo',
+ // label: 'IFS搴忓垪鍙�',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
{
minWidth: '100',
prop: 'qtyApply',
@@ -690,7 +690,7 @@
minWidth: '140',
width: '120',
prop: 'endDate',
- label: '鍒版湡鏃�',
+ label: '鍒版湡鏃堕棿',
sort: true,
isTrue: true,
isSearch: true,
@@ -1033,13 +1033,13 @@
},
initQueryParams() {
const queryParam = []
- queryParam.push(
- Object.assign({
- prop: 'state',
- searchInfoType: 'select',
- propVal: '01planned'
- })
- )
+ // queryParam.push(
+ // Object.assign({
+ // prop: 'state',
+ // searchInfoType: 'select',
+ // propVal: '01planned'
+ // })
+ // )
this.$refs.manufacturingOrderTable.setQueryParam(queryParam)
this.getData()
},
--
Gitblit v1.9.3