From 0a3b4bac16a4cf49deaddc6b4f3a2aeee90e9061 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 21 五月 2024 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/technology/structure/index.vue | 72 ++++++-----------------------------
1 files changed, 13 insertions(+), 59 deletions(-)
diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index 17fed50..3704dd8 100644
--- a/src/views/technology/structure/index.vue
+++ b/src/views/technology/structure/index.vue
@@ -6,7 +6,6 @@
@handleSelectionChange="handleSelectionChange"
@customUploadPage="structureImport"
:uploadInfo="uploadInfo"
- :customUpload="customUpload"
:prelang="prelang"
:options="options"
:ajaxFun="ajaxFun"
@@ -19,47 +18,6 @@
v-if="permissions.technology_structure_copy">澶嶅埗</el-button>
</template>
</ttable>
- <!-- 寮圭獥, 鏂板 / 淇敼 -->
- <el-dialog
- title="瀵煎叆"
- :visible.sync="importStructureVisible"
- width="50%"
- >
- <span>
- <div style="display:flex;justify-content:space-around;">
- <div>
- <el-upload
- style="margin-left:8px;display: inline;"
- class="upload-demo"
- drag
- :headers="headers"
- :action="zhuangbeiUploadInfo.url"
- :beforeUpload="beforeAvatarUpload"
- :limit="1"
- :show-file-list="false"
- :file-list="zhuangbeifileList"
- :data="zhuangbeiUploadInfo.uploadData"
- :on-success="zhuangbeiFileSuccessUploadScan"
- :on-error="handleError"
- accept=".xlsx,.xls,.csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
- :auto-upload="true"
- ref="zhuangbeiUploadScan"
- multiple
- >
- <i class="el-icon-upload"></i>
- <div class="el-upload__text"><em>瀵煎叆浜у搧缁撴瀯</em></div>
- <div class="el-upload__tip" slot="tip">
- 鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10M<el-button
- type="text"
- style="font-size:12px;"
- ></el-button
- >
- </div>
- </el-upload>
- </div>
- </div>
- </span>
- </el-dialog>
</basic-container>
</div>
</template>
@@ -98,6 +56,8 @@
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
isShow: true,
+ fileName: '浜у搧缁撴瀯妯℃澘',
+ download: true,
url: '/mes/structure/uploadExcelPlus'
},
prelang: 'structure',
@@ -231,14 +191,7 @@
}
],
toolbar: [],
- operator: [
- {
- text: '鍒犻櫎',
- type: 'text',
- size: 'small',
- fun: this.deleteHandle
- }
- ],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
@@ -276,11 +229,6 @@
isShow: true,
url: '/mes/structure/upload'
},
- zhuangbeiUploadInfo: {
- // 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
- url: '/mes/structure/uploadExcelPlus'
- },
zhuangbeifileList: [],
shepinfileList: [],
ifsSynsLoading: false
@@ -298,6 +246,16 @@
this.getData()
},
created() {
+ if(this.permissions.technology_structure_del){
+ this.table.operator = [
+ {
+ text: '鍒犻櫎',
+ type: 'text',
+ size: 'small',
+ fun: this.deleteHandle
+ }
+ ]
+ }
this.uploadInfo.isShow = this.permissions.technology_structure_upload
this.table.column.find((e) => e.label === '宸插悓姝ヨ嚦ERP').isTrue = false
this.getBomTypeDbOptions()
@@ -329,10 +287,6 @@
},
// 鍒犻櫎
deleteHandle(row) {
- if(!this.permissions.technology_structure_del){
- this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
- return
- }
this.$confirm('鏄惁纭鍒犻櫎ID涓�' + row.id, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
--
Gitblit v1.9.3