mes-ocea-before.git

			@@ -341,8 +341,18 @@
			// 按产品结构生成BOM
			addByStructureHandle() {
			addByStructure().then((res) => {
			let result = Array.from(new Set(res.data.data))
			this.$message.success(result.join(','))
			// let result = Array.from(new Set(res.data.data))
			// this.$message.success(result.join(','))
			console.log(res.data.data);
			let mes="";
			res.data.data.forEach(item=>{
			mes+=item
			})
			this.$message({
			message: mes,
			type: 'success',
			dangerouslyUseHTMLString: true
			})
			this.getData()
			})
			// this.$message({

			@@ -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>
			@@ -129,8 +97,8 @@
			customUpload: true,
			uploadInfo: {
			// 是否展示上传EXCEL以及对应的url
			isShow: false,
			url: '/mes/structure/uploadExt'
			isShow: true,
			url: '/mes/structure/uploadExcelPlus'
			},
			prelang: 'structure',
			options: {
			@@ -326,7 +294,7 @@
			zhuangbeiUploadInfo: {
			// 是否展示上传EXCEL以及对应的url
			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()
			}

	src/views/technology/completeproductstructure/index.vue	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/technology/structure/index.vue	47 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史