mes-ocea-before.git

			@@ -164,7 +164,7 @@
			:span-method="objectSpanMethod"
			:header-cell-style="tableHeaderStyle"
			v-adaptive="{ bottomOffset: bottomOffset, fixedHeight: fixedHeight }"
			height="100px"
			height="300px"
			:class="[
			'commonTable',
			isGeneralSearch && !isEdit
			@@ -508,9 +508,9 @@
			<div class="el-upload__tip" slot="tip" >
			只能上传xlsx/xls文件，且不超过10M<el-button
			type="text"
			style="font-size:12px;"
			style="font-size:14px;text-decoration: underline;"
			@click="downDataTemplate(uploadInfo.fileName)"
			v-if="uploadInfo.Download"
			v-if="uploadInfo.download"
			>下载模板</el-button
			>
			</div>
			@@ -567,6 +567,10 @@
			default: ()=>{
			return 'id'
			}
			},
			toolbarMaxLength: {
			type: Number,
			default: 5,
			},
			// 表格型号：mini,medium,small
			tableSize: { type: String, default: 'small' },
			@@ -755,11 +759,11 @@
			return colList
			},
			getToolBarBtn() {
			return this.table.toolbar ? this.table.toolbar.slice(0, 5) : []
			return this.table.toolbar ? this.table.toolbar.slice(0, this.toolbarMaxLength) : []
			},
			getToolbarDown() {
			return this.getToolBarBtn.length === 5
			? this.table.toolbar.slice(5, this.table.toolbar.length)
			return this.getToolBarBtn.length == this.toolbarMaxLength
			? this.table.toolbar.slice(this.toolbarMaxLength, this.table.toolbar.length)
			: []
			},
			isRefreshBtn() {
			@@ -1583,7 +1587,8 @@
			if(response.data!=""&&response.data!=[]&&response.data!=null){
			this.$message({
			message: response.data,
			type: 'success'
			type: 'success',
			dangerouslyUseHTMLString: true,
			})
			}else{
			this.$message({