From 5cdff5e062935666b06848a3b63ae9b32d114146 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 04 十一月 2023 17:35:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/technology/structure/index.vue | 78 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index 0538871..0037fbb 100644
--- a/src/views/technology/structure/index.vue
+++ b/src/views/technology/structure/index.vue
@@ -47,7 +47,7 @@
multiple
>
<i class="el-icon-upload"></i>
- <div class="el-upload__text"><em>瀵煎叆瑁呭鏁版嵁</em></div>
+ <div class="el-upload__text"><em>瀵煎叆浜у搧缁撴瀯鏁版嵁</em></div>
<div class="el-upload__tip" slot="tip">
鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10M<el-button
type="text"
@@ -58,7 +58,7 @@
</div>
</el-upload>
</div>
- <div>
+ <!-- <div>
<el-upload
style="margin-left:8px;display: inline;"
class="upload-demo"
@@ -88,7 +88,7 @@
>
</div>
</el-upload>
- </div>
+ </div> -->
</div>
</span>
</el-dialog>
@@ -132,7 +132,7 @@
isShow: true,
url: '/mes/structure/uploadExt'
},
- prelang: 'structure',
+ prelang: 'operation',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
stripe: true, // 鏄惁涓烘枒椹汗 table
@@ -198,42 +198,42 @@
return this.bomTypeDbOptions
}
},
- // 鏇夸唬
- {
- minWidth: '120',
- prop: 'alternativeNo',
- label: '鏇夸唬',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- // 鏇夸唬鎻忚堪
- {
- minWidth: '120',
- prop: 'alternativeDesc',
- label: '鏇夸唬鎻忚堪',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // // 鏇夸唬
+ // {
+ // minWidth: '120',
+ // prop: 'alternativeNo',
+ // label: '鏇夸唬',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // // 鏇夸唬鎻忚堪
+ // {
+ // minWidth: '120',
+ // prop: 'alternativeDesc',
+ // label: '鏇夸唬鎻忚堪',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 鏄惁宸插悓姝ヨ嚦ERP
- {
- minWidth: '120',
- prop: 'ifsSync',
- label: '宸插悓姝ヨ嚦ERP',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- optList: () => {
- return this.getIfsSyncOptionList()
- },
- formatter: (row, column, cellValue) => {
- return cellValue == true ? '鏄�' : '鍚�'
- }
- },
+ // {
+ // minWidth: '120',
+ // prop: 'ifsSync',
+ // label: '宸插悓姝ヨ嚦ERP',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // optList: () => {
+ // return this.getIfsSyncOptionList()
+ // },
+ // formatter: (row, column, cellValue) => {
+ // return cellValue == true ? '鏄�' : '鍚�'
+ // }
+ // },
// 鏄惁涓洪粯璁ょ粨鏋�
{
minWidth: '120',
--
Gitblit v1.9.3