From 5fcfed0c9e6dac85f680c705c9b20abad79e1324 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 19 十二月 2023 17:33:05 +0800
Subject: [PATCH] modified: src/const/website.js new file: src/page/PackingLedgerDetails/index.vue modified: src/router/page/index.js modified: src/views/plan/manufacturingorder/index.vue modified: src/views/quality/Packaging_ledger/index.vue modified: vue.config.js
---
src/views/technology/structure/index.vue | 115 +++++++++++++++++++++------------------------------------
1 files changed, 42 insertions(+), 73 deletions(-)
diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index ef5f8fe..53ae977 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,44 +47,12 @@
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"
style="font-size:12px;"
- @click="downZhuangbeiDataTemplate"
- >涓嬭浇妯℃澘</el-button
- >
- </div>
- </el-upload>
- </div>
- <div>
- <el-upload
- style="margin-left:8px;display: inline;"
- class="upload-demo"
- drag
- :headers="headers"
- :action="shepinUploadInfo.url"
- :beforeUpload="beforeAvatarUpload"
- :limit="1"
- :show-file-list="false"
- :file-list="shepinfileList"
- :data="shepinUploadInfo.uploadData"
- :on-success="shepinFileSuccessUploadScan"
- :on-error="handleError"
- accept=".xlsx,.xls,.csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
- :auto-upload="true"
- ref="shepinUploadScan"
- 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;"
- @click="downShepinDataTemplate"
- >涓嬭浇妯℃澘</el-button
+ ></el-button
>
</div>
</el-upload>
@@ -130,7 +98,7 @@
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
isShow: true,
- url: '/mes/structure/uploadExt'
+ url: '/mes/structure/uploadExcelPlus'
},
prelang: 'structure',
options: {
@@ -185,39 +153,39 @@
searchInfoType: 'text'
},
// 缁撴瀯绫诲瀷
- {
- minWidth: '120',
- prop: 'bomTypeDb',
- label: '缁撴瀯绫诲瀷',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- formatter: this.formatBomTypeDbType,
- optList: () => {
- return this.bomTypeDbOptions
- }
- },
+ // {
+ // minWidth: '120',
+ // prop: 'bomTypeDb',
+ // label: '缁撴瀯绫诲瀷',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // formatter: this.formatBomTypeDbType,
+ // optList: () => {
+ // return this.bomTypeDbOptions
+ // }
+ // },
// 鏇夸唬
- {
- minWidth: '120',
- prop: 'alternativeNo',
- 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'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'alternativeDesc',
+ // label: '鏇夸唬鎻忚堪',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 鏄惁宸插悓姝ヨ嚦ERP
{
minWidth: '120',
@@ -235,7 +203,7 @@
}
},
// 鏄惁涓洪粯璁ょ粨鏋�
- {
+ /* {
minWidth: '120',
prop: 'master',
label: '榛樿缁撴瀯',
@@ -249,7 +217,7 @@
formatter: (row, column, cellValue) => {
return cellValue == true ? '鏄�' : '鍚�'
}
- },
+ }, */
// 鎻忚堪
{
minWidth: '120',
@@ -326,7 +294,7 @@
zhuangbeiUploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
isShow: true,
- url: '/mes/structure/uploadExt'
+ url: '/mes/structure/uploadExcelPlus'
},
zhuangbeifileList: [],
shepinfileList: [],
@@ -487,8 +455,9 @@
this.$message.warning(response.msg)
} else {
this.$message({
- message: '涓婁紶鎴愬姛',
- type: 'success'
+ message: response.data,
+ type: 'success',
+ dangerouslyUseHTMLString: true
})
this.getData()
}
--
Gitblit v1.9.3