From 45e7495fe17c3b390a6d0e2461f0b8f965d46f6f Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 09 十一月 2023 09:11:28 +0800
Subject: [PATCH] modified: src/api/basic/param.js modified: src/views/basic/company/index.vue modified: src/views/basic/division/index.vue modified: src/views/basic/factory/index.vue modified: src/views/basic/param/index.vue modified: src/views/basic/part/index.vue modified: src/views/basic/template/index.vue modified: src/views/common/param.vue modified: src/views/common/ztt-table.vue modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/completeproductstructure/index.vue modified: src/views/technology/structure/index.vue modified: src/views/technology/structure/single-structure-form.vue
---
src/views/technology/structure/index.vue | 96 ++++++++++++++++++++++++++---------------------
1 files changed, 53 insertions(+), 43 deletions(-)
diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index ef5f8fe..09b2ad0 100644
--- a/src/views/technology/structure/index.vue
+++ b/src/views/technology/structure/index.vue
@@ -13,9 +13,9 @@
ref="structureTable"
>
<template #toolbar>
- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
+ <!-- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
>ERP鍚屾</el-button
- >
+ > -->
</template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
@@ -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
@@ -155,6 +155,15 @@
// 鏍囬
column: [
// 闆朵欢鍙�
+ {
+ minWidth: '140',
+ prop: 'custom',
+ label: '瀹㈡埛鍚嶇О',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
{
minWidth: '140',
prop: 'partNo',
@@ -198,42 +207,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',
@@ -487,10 +496,11 @@
this.$message.warning(response.msg)
} else {
this.$message({
- message: '涓婁紶鎴愬姛',
+ message: '涓婁紶鎴愬姛,鍚庡彴姝ｅ湪瀵煎叆,璇风◢鍚庨噸鏂板埛鏂帮紒',
type: 'success'
})
- this.getData()
+ this.importStructureVisible=false
+ // this.getData()
}
this.$refs.zhuangbeiUploadScan.clearFiles()
},
--
Gitblit v1.9.3