diff --git a/src/api/model/setup.js b/src/api/model/setup.js
index 4587425..7be9989 100644
--- a/src/api/model/setup.js
+++ b/src/api/model/setup.js
@@ -256,6 +256,13 @@ export default {
 			post: async function (data) {
 				return await http.post(this.url, data);
 			},
-		}
+		},
+		export:{
+			url: `${config.API_URL}/bom.export`,
+			name: "BOM导出",
+			post: async function (params) {
+				return await http.post(this.url,params);
+			}
+		},
 	}
 };
diff --git a/src/components/scExport/index.vue b/src/components/scExport/index.vue
index 5096399..510551e 100644
--- a/src/components/scExport/index.vue
+++ b/src/components/scExport/index.vue
@@ -1,34 +1,28 @@
 <template>
-	<el-popover
-		placement="bottom-end"
-		title=""
-		trigger="click"
-		content=""
-		width="300"
-		v-bind="$attrs"
-		:visible="show"
-	>
-		<template #reference>
+	<div class="customerPopover">
+		<div class="btnBox">
 			<slot></slot>
-		</template>
-		<template #default>
-			<div v-for="item in list" :key="item">
-				<div v-if="list.length>0 && type == item.type">
-					<div class="exportHeader">
-						<div class="name">{{item.type_desc}}</div>
-						<div class="status" v-if="item.status==0">{{item.msg}}</div>
-						<div class="finish" v-if="item.status==1"><i class="icon"><sc-icon-Finish/></i> 文件生成完成</div>
+		</div>
+		<div class="contentPopover" v-if="show">
+			<div class="bodyMain">
+				<span class="arrow"></span>
+				<div v-for="item in list" :key="item">
+					<div v-if="list.length>0 && type == item.type">
+						<div class="exportHeader">
+							<div class="name">{{item.type_desc}}</div>
+							<div class="status" v-if="item.status==0">{{item.msg}}</div>
+							<div class="finish" v-if="item.status==1"><i class="icon"><sc-icon-Finish/></i> 文件生成完成</div>
+						</div>
+						<el-progress class="exportPopover" :text-inside="true" :stroke-width="12" :percentage="item.rate" />
 					</div>
-					<el-progress class="exportPopover" :text-inside="true" :stroke-width="12" :percentage="item.rate" />
 				</div>
 			</div>
-		</template>
-	</el-popover>
+		</div>
+	</div>
 </template>
 
 <script>
 import {eventBus} from "@/utils/eventBus"
-
 export default {
 	name: "index",
 	props:{
@@ -37,15 +31,17 @@ export default {
 		type:{type: String, default: ""}
 	},
 	watch:{
-
+		// show:{
+		// 	handler(){
+		// 	},
+		// 	immediate:true,
+		// 	deep:true
+		// }
 	},
 	data(){
 		return{
-			list:[{},{},{},{},{},{},{},{}],
+			list:[{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}],
 		}
-	},
-	setup(){
-
 	},
 	mounted() {
 		// 获取新消息
@@ -56,7 +52,7 @@ export default {
 	},
 	methods:{
 		getWsResult(res){
-			if(res.data && (res.data.type == 6 || res.data.type == 7 || res.data.type == 8 || res.data.type == 11 || res.data.type == 19 || res.data.type == 20 || res.data.type == 29 || res.data.type == 30)){
+			if(res.data && (res.data.type == 6 || res.data.type == 7 || res.data.type == 8 || res.data.type == 11 || res.data.type == 19 || res.data.type == 20 || res.data.type == 29 || res.data.type == 30 || res.data.type == 32 || res.data.type == 33)){
 				let item = {
 					type:res.data.type,
 					type_desc:res.data.type_desc,
@@ -64,29 +60,37 @@ export default {
 					status:res.data.status,
 					rate:res.data.rate,
 				}
-				if(res.data.type == 6){
-					this.list[0] = item;
-				}
-				if(res.data.type == 7){
-					this.list[1] = item;
-				}
-				if(res.data.type == 8){
-					this.list[2] = item;
-				}
-				if(res.data.type == 11){
-					this.list[3] = item;
-				}
-				if(res.data.type == 19){
-					this.list[4] = item;
-				}
-				if(res.data.type == 20){
-					this.list[5] = item;
-				}
-				if(res.data.type == 29){
-					this.list[6] = item;
-				}
-				if(res.data.type == 30){
-					this.list[7] = item;
+				switch(res.data.type){
+					case 6:
+						this.list[0] = item;
+						break;
+					case 7:
+						this.list[1] = item;
+						break;
+					case 8:
+						this.list[2] = item;
+						break;
+					case 11:
+						this.list[3] = item;
+						break;
+					case 19:
+						this.list[4] = item;
+						break;
+					case 20:
+						this.list[5] = item;
+						break;
+					case 29:
+						this.list[6] = item;
+						break;
+					case 30:
+						this.list[7] = item;
+						break;
+					case 32:
+						this.list[8] = item;
+						break;
+					default:
+						this.list[9] = item;
+						break;
 				}
 				this.$emit('updateShow', item);
 
@@ -127,4 +131,45 @@ export default {
 		display: flex;align-items: center;justify-content: flex-end;
 		font-size: 10px;
 	}
+
+	.customerPopover{
+		position: relative;
+		height: auto;
+		.contentPopover{
+			width: 300px;
+			padding: 12px;
+			background: var(--el-bg-color-overlay);
+			border: 1px solid var(--el-border-color-light);
+			box-shadow: var(--el-box-shadow-light);
+			border-radius: 4px;
+			position: absolute;
+			top: 38px;
+			right: 0;
+			z-index: 200;
+		}
+		.bodyMain{
+			position: relative;
+			.arrow{
+				position: absolute;
+				right: 0;
+				top: -18px;
+				width: 8px;height: 8px;z-index: 10;
+			}
+			.arrow:before{
+				position: absolute;
+				top: 0;
+				right: 10px;
+				z-index: -1;
+				content: '';
+				width: 8px;
+				height: 8px;
+				transform:rotate(135deg);
+				border: 1px solid var(--el-border-color-light);
+				background: #fff;
+				border-bottom-left-radius:2px;
+				border-right-color:transparent;
+				border-top-color:transparent;
+			}
+		}
+	}
 </style>
diff --git a/src/store/modules/msg.js b/src/store/modules/msg.js
index bec33be..25a9620 100644
--- a/src/store/modules/msg.js
+++ b/src/store/modules/msg.js
@@ -8,7 +8,9 @@ export default {
 			workOrder:[],
 			spareParts:[],
 			reachStandard:[]
-		}
+		},
+
+		exportMsg:{}
 	},
 	mutations: {
 		set_list_count_info(state, list){
@@ -18,18 +20,24 @@ export default {
 			state.repair_count = list;
 		},
 		set_home_msg(state,key){
-			if(key.data && (key.data.type==21 || key.data.type==24 || key.data.type == 25 || key.data.type == 26))
-			if(key.data.type == 21){
-				state.home_msg.briefing = key;
-
-			}else if(key.data.type == 24){
-				state.home_msg.workOrder = key;
-
-			}else if(key.data.type == 25){
-				state.home_msg.spareParts = key;
-
-			}else if(key.data.type == 26){
-				state.home_msg.reachStandard = key;
+			if(key.data){
+				switch (key.data.type) {
+					case 21:
+						state.home_msg.briefing = key;
+						break
+					case 24:
+						state.home_msg.workOrder = key;
+						break
+					case 25:
+						state.home_msg.spareParts = key;
+						break
+					case 26:
+						state.home_msg.reachStandard = key;
+						break
+					default:
+						state.exportMsg = key;
+						break;
+				}
 			}
 		}
 	},
diff --git a/src/views/setting/advanced/components/addRegion.vue b/src/views/setting/advanced/components/addRegion.vue
new file mode 100644
index 0000000..f2b49e3
--- /dev/null
+++ b/src/views/setting/advanced/components/addRegion.vue
@@ -0,0 +1,112 @@
+<template>
+	<el-dialog :title="titleMap[mode]" v-model="visible" :width="500" destroy-on-close @closed="$emit('closed')">
+		<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="100px">
+			<el-form-item label="区域名称" prop="region_name">
+<!--				<el-input v-model="form.region_name" placeholder="请输入区域位置" clearable></el-input>-->
+				<el-select v-model="form.region_name" placeholder="请输入区域位置" clearable>
+					<el-option v-for="(item,index) in setMap.regionList" :key="index" :label="item.label" :value="item.value"></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="机房代码" prop="room_code">
+				<el-input v-model="form.room_code" placeholder="请输入机房代码" clearable></el-input>
+			</el-form-item>
+			<el-form-item label="机房全称" prop="room_name">
+				<el-input v-model="form.room_name" placeholder="请输入机房名称" clearable></el-input>
+			</el-form-item>
+			<el-form-item label="机房位置" prop="room_location">
+				<el-input v-model="form.room_location" placeholder="请输入机房位置" clearable></el-input>
+			</el-form-item>
+		</el-form>
+		<template #footer>
+			<el-button @click="visible=false" >取 消</el-button>
+			<el-button v-if="mode!='show'" type="primary" :loading="isSave" @click="submit()">保 存</el-button>
+		</template>
+	</el-dialog>
+</template>
+
+<script>
+export default {
+	name: "addRegion",
+	emits: ['success', 'closed'],
+	data() {
+		return {
+			mode: "add",
+			titleMap: {
+				add: '新增',
+				edit: '编辑',
+				show: '查看'
+			},
+			setMap:{
+				regionList:[]
+			},
+			visible: false,
+			isSave: false,
+			//表单数据
+			form: {
+				id:"",
+				region_name: "",
+				room_code:"",
+				room_name: "",
+				room_location: ""
+			},
+			//验证规则
+			rules: {
+				region_name: [
+					{required: true, message: '请输入区域位置'}
+				],
+				room_code: [
+					{required: true, message: '请输入机房代码'}
+				],
+				room_name: [
+					{required: true, message: '请输入机房名称'}
+				],
+				room_location: [
+					{required: true, message: '请输入机房位置'}
+				],
+			},
+		}
+	},
+	mounted() {
+		this.getRoom();
+	},
+	methods: {
+		//显示
+		open(mode='add'){
+			this.mode = mode;
+			this.visible = true;
+			return this
+		},
+
+		async getRoom() {
+			const res = await this.$API.setup.regional.regionalList.post();
+			if (res.code == 200) {
+				this.setMap.regionList = res.data;
+			}
+		},
+
+		//表单提交方法
+		submit(){
+			this.$refs.dialogForm.validate(async (valid) => {
+				if (valid) {
+					this.isSave = true;
+					const res = await this.$API.setup.regional.add.post(this.form);
+					this.isSave = false;
+					if(res.code == 200){
+						this.$emit('success', this.form, this.mode)
+						this.visible = false;
+						this.$message.success("操作成功")
+					}
+				}
+			})
+		},
+		setData(data){
+			Object.assign(this.form, data);
+			// console.log(this.form,788)
+		}
+	}
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/setting/advanced/setup/region.vue b/src/views/setting/advanced/setup/region.vue
index 22975c3..acba0ad 100644
--- a/src/views/setting/advanced/setup/region.vue
+++ b/src/views/setting/advanced/setup/region.vue
@@ -1,35 +1,32 @@
 <template>
-	<el-container class="mainBox">
+	<el-container class="mainBox mainBoxHeaderNoBorder">
 		<el-main class="nopadding">
-			<div class="searchMain">
-				<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData"></scSearch>
-
-				<div class="searchItem searchBtn">
-					<el-button :size="size" type="primary" @click="save">保存配置</el-button>
+			<el-header>
+				<div class="left-panel">
+					<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增</el-button>
+					<el-button plain type="danger" :disabled="selection.length==0?true:false" :size="size" icon="el-icon-Delete" @click="all_delete"></el-button>
 				</div>
-			</div>
-			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow :hideDo="true" >
+				<div class="right-panel">
+
+				</div>
+			</el-header>
+			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow :hideDo="true" @selection-change="selectionChange">
+				<el-table-column type="selection" align="center" width="40"></el-table-column>
 				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
-<!--				<el-table-column width="380" label="客户名称" prop="customer_name">-->
-<!--					<template #default="scope">-->
-<!--						<div v-if="scope.row.$edit_show">-->
-<!--							<el-input type="text" :size="size" v-model="scope.row.customer_name" @change="customerInput(scope.row)" @mouseout="customerOut(scope.row)"></el-input>-->
-<!--						</div>-->
-<!--						<span class="customerView" @click="customerEdit(scope.row)" v-else>{{scope.row.customer_name}} <el-icon class="iconBtn"><sc-icon-edit/></el-icon></span>-->
-<!--					</template>-->
-<!--				</el-table-column>-->
-<!--				<el-table-column width="100" label="状态" prop="active_status">-->
-<!--					<template #default="scope">-->
-<!--						<el-switch :size="size" v-model="scope.row.active_status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>-->
-<!--					</template>-->
-<!--				</el-table-column>-->
+				<template #data_source="scope">
+					<span v-for="(item,index) in setMap.sourceList" :key="index">
+						<span v-if="item.value === scope.row.data_source">{{item.label}}</span>
+					</span>
+				</template>
 				<el-table-column label="操作" fixed="right" align="center" width="160">
 					<template #default="scope">
 						<el-dropdown>
 							<el-button class="noBorderBtn" icon="el-icon-more" :size="size"></el-button>
 							<template #dropdown>
 								<el-dropdown-menu>
-									<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除配置</el-dropdown-item>
+									<el-dropdown-item @click="table_see(scope.row, 'see')" icon="sc-icon-See">查看详情</el-dropdown-item>
+									<el-dropdown-item @click="table_edit(scope.row, 'edit')" icon="sc-icon-Edit">编辑配置</el-dropdown-item>
+									<el-dropdown-item @click="table_del(scope.row, 'delete')" divided icon="sc-icon-Delete">删除配置</el-dropdown-item>
 								</el-dropdown-menu>
 							</template>
 						</el-dropdown>
@@ -38,85 +35,97 @@
 			</scTable>
 		</el-main>
 	</el-container>
+
+	<add-region v-if="dialog.save" ref="saveDialog" @success="handleSuccess" @closed="dialog.save=false"></add-region>
 </template>
 
 <script>
+import addRegion from "../components/addRegion";
 export default {
 	name: "region",
+	components:{
+		addRegion
+	},
 	data(){
 		return{
 			size:'small',
+			setMap:{
+				sourceList:[],
+				regionalList:[],
+			},
 			list:{
 				apiObj: this.$API.setup.regional.list,
 				column:[]
 			},
+			selection:[],
 			params: {},
-			searchList:[
-				{customer_name:'客户名称',type:'text',code:'customer_name', placeholder:"请输入客户名称",show:true},
-			],
+
+			dialog:{
+				show:false,
+			},
 		}
 	},
 	mounted() {
-
+		this.getRegion();
 	},
 	methods:{
-		getSelectData(item){
-			let {params} = item;
-			this.params = params;
-		},
-		// 状态
-		changeSwitch(val, row) {
-			row.$switch_yx = true;
-			setTimeout(async () => {
-				let params = {
-					id: row.id,
-					active_status: row.active_status,
-				};
-				const res = await this.$API.setup.customer.status.post(params);
-				if(res.code !=200){
-					row.active_status = !row.active_status;
-				}
-				delete row.$switch_status;
-				delete row.$switch_yx;
-			}, 500);
-		},
-		// 编辑名称
-		customerEdit(row){
-			row.$edit_show = !row.$edit_show;
-		},
-		customerOut(row){
-			setTimeout(()=>{
-				row.$edit_show = false;
-			},1000)
-		},
-		async customerInput(row) {
-			let params = {
-				id:row.id,
-				customer_name:row.customer_name
-			}
-			const res = await this.$API.setup.customer.add.post(params);
+		async getRegion() {
+			const res = await this.$API.setup.regional.sourceList.post();
 			if(res.code == 200){
-				this.$refs.table.refresh();
+				this.setMap.sourceList = res.data;
 			}
 		},
-		async save() {
-			const res = await this.$API.setup.customer.add.post(this.params);
-			if(res.code == 200){
-				this.$refs.table.refresh();
-			}
+
+		add(){
+			this.dialog.save = true
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open()
+			})
+		},
+		handleSuccess(){
+			this.$refs.table.refresh()
+		},
+		//表格选择后回调事件
+		selectionChange(selection){
+			this.selection = selection;
+		},
+		// 查看
+		table_see(row){
+			this.dialog.save = true
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open('show').setData(row)
+			})
+		},
+		table_edit(row){
+			this.dialog.save = true
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open('edit').setData(row)
+			})
 		},
 		async table_del(row){
-			this.$confirm(`确定删除 ${row.customer_name} 吗？`, '提示', {
+			this.$confirm(`确定删除 ${row.room_code} 吗？`, '提示', {
 				type: 'warning'
 			}).then(async () => {
-				const reqData = {id: row.id};
-				const res = await this.$API.setup.customer.delete.post(reqData);
+				const reqData = {ids: [row.id]};
+				const res = await this.$API.setup.regional.delete.post(reqData);
 				if(res.code == 200){
 					this.$refs.table.refresh();
-					this.$message.success("删除成功")
+					this.$message.success("删除成功");
 				}
 			}).catch(()=>{})
 		},
+		async all_delete(){
+			this.$confirm(`确定删除所选 ${this.selection.length} 项吗？`, '提示', {
+				type: 'warning'
+			}).then(async () => {
+				const reqData = {ids: this.selection.map(em=>em.id)};
+				const res = await this.$API.setup.regional.delete.post(reqData);
+				if(res.code == 200){
+					this.$refs.table.refresh();
+					this.$message.success("删除成功");
+				}
+			}).catch(()=>{})
+		}
 	}
 }
 </script>
diff --git a/src/views/setting/bom/index.vue b/src/views/setting/bom/index.vue
index 09f4dd7..82ec86b 100644
--- a/src/views/setting/bom/index.vue
+++ b/src/views/setting/bom/index.vue
@@ -4,6 +4,11 @@
 			<div class="left-panel">
 				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增BOM</el-button>
 			</div>
+			<div class="right-panel">
+				<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="33">
+					<el-button :size="size" v-auth="'bomListExport'" icon="sc-icon-Download" :disabled="exportShow" @click="exportData">下载</el-button>
+				</scExport>
+			</div>
 		</el-header>
 		<el-main class="nopadding">
 			<div class="searchMain searchMainNoTop">
@@ -18,35 +23,26 @@
 			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
 				<el-table-column type="selection" align="center" width="40"></el-table-column>
 				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
-				<template #logo="scope">
-					<el-image class="logoCell" :src="scope.row.logo" preview-teleported :preview-src-list="[scope.row.logo]" fit="contain">
-						<template #error>
-							<div class="image-slot" style="text-align: center;font-size: 20px;">
-								<el-icon><el-icon-Picture /></el-icon>
-							</div>
-						</template>
-					</el-image>
-				</template>
-				<template #active_status="scope">
-					<el-switch :size="size" v-model="scope.row.active_status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>
-				</template>
-				<el-table-column label="操作" fixed="right" align="center" width="150">
-					<template #default="scope">
-						<el-dropdown>
-							<el-button class="noBorderBtn" icon="el-icon-more" :size="size"></el-button>
-							<template #dropdown>
-								<el-dropdown-menu>
-									<el-dropdown-item @click="table_show(scope.row, 'see')" icon="sc-icon-See">查看详情</el-dropdown-item>
-									<el-dropdown-item @click="table_edit(scope.row, 'edit')" icon="sc-icon-Edit">编辑公司</el-dropdown-item>
-									<el-dropdown-item  icon="sc-icon-AbilityAuthorization" @click="table_empower(scope.row)" divided>功能授权</el-dropdown-item>
-									<el-dropdown-item  icon="sc-icon-DataAuthorization">数据授权</el-dropdown-item>
-									<el-dropdown-item  icon="sc-icon-UserList" @click="table_user_ist(scope.row)" divided>用户列表</el-dropdown-item>
-									<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除公司</el-dropdown-item>
-								</el-dropdown-menu>
-							</template>
-						</el-dropdown>
-					</template>
-				</el-table-column>
+<!--				<template #active_status="scope">-->
+<!--					<el-switch :size="size" v-model="scope.row.active_status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>-->
+<!--				</template>-->
+<!--				<el-table-column label="操作" fixed="right" align="center" width="150">-->
+<!--					<template #default="scope">-->
+<!--						<el-dropdown>-->
+<!--							<el-button class="noBorderBtn" icon="el-icon-more" :size="size"></el-button>-->
+<!--							<template #dropdown>-->
+<!--								<el-dropdown-menu>-->
+<!--									<el-dropdown-item @click="table_show(scope.row, 'see')" icon="sc-icon-See">查看详情</el-dropdown-item>-->
+<!--									<el-dropdown-item @click="table_edit(scope.row, 'edit')" icon="sc-icon-Edit">编辑公司</el-dropdown-item>-->
+<!--									<el-dropdown-item  icon="sc-icon-AbilityAuthorization" @click="table_empower(scope.row)" divided>功能授权</el-dropdown-item>-->
+<!--									<el-dropdown-item  icon="sc-icon-DataAuthorization">数据授权</el-dropdown-item>-->
+<!--									<el-dropdown-item  icon="sc-icon-UserList" @click="table_user_ist(scope.row)" divided>用户列表</el-dropdown-item>-->
+<!--									<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除公司</el-dropdown-item>-->
+<!--								</el-dropdown-menu>-->
+<!--							</template>-->
+<!--						</el-dropdown>-->
+<!--					</template>-->
+<!--				</el-table-column>-->
 			</scTable>
 		</el-main>
 	</el-container>
@@ -102,6 +98,9 @@ export default {
 			params: {},
 		}
 	},
+	mounted() {
+		console.log(32423)
+	},
 	methods: {
 		searchShowClick(){
 			this.searchShow = !this.searchShow;
@@ -112,39 +111,8 @@ export default {
 			})
 		},
 		getSelectData(item){
-			let {data,params} = item;
+			let {params} = item;
 			this.params = params;
-			if(data.code == "id"){
-				this.getCompanyList(data,params)
-			}else if(data.code == "active_status"){
-				this.getStatusList(data,params);
-			}
-		},
-
-		async getCompanyList(data,params) {
-			const res = await this.$API.system.company.select.post(params);
-			if(res.data && res.data.length>0){
-				res.data.forEach(item=>{
-					item.label = item.full_name;
-				})
-			}
-			if(res.code == 200){
-				this.searchList.forEach(item=>{
-					if(item.code == data.code){
-						item.data = res.data;
-					}
-				})
-			}
-		},
-		async getStatusList(data,params) {
-			const res = await this.$API.oss.status.post(params);
-			if(res.code == 200){
-				this.searchList.forEach(item=>{
-					if(item.code == data.code){
-						item.data = res.data;
-					}
-				})
-			}
 		},
 
 		//添加
@@ -155,35 +123,6 @@ export default {
 			})
 		},
 
-		// 批量导入
-		importFile(){
-			this.$nextTick(()=>{
-				this.$refs.scImport.importFile();
-			})
-		},
-		async importTemplate() {
-			const res = await this.$API.orders.order.maintenance.template.post();
-			const blob = new Blob([res]);
-			const text = new Date().getTime();
-			const eLink = document.createElement('a');
-			eLink.download = "维保导入模版_"+text+'.xlsx';
-			eLink.style.display = 'none';
-			eLink.href = URL.createObjectURL(blob);
-			document.body.appendChild(eLink);
-			eLink.click();
-			URL.revokeObjectURL(eLink.href);
-			document.body.removeChild(eLink);
-		},
-		async importUpload(params) {
-			const res = await this.$API.orders.order.maintenance.import.post(params);
-			if(res.code == 200){
-				this.$message.success('上传成功，开始导入数据');
-			}
-		},
-		importSuccess(){
-			this.$refs.table.refresh()
-		},
-
 		//编辑
 		table_edit(row){
 			this.dialog.save = true
@@ -213,55 +152,21 @@ export default {
 				}
 			}).catch(()=>{})
 		},
-		// 功能授权
-		table_empower(row){
-			this.$router.push({
-				path: '/setting/company/add-permission',
-				query: {
-					id: row.id,
-					name:row.name
-				}
-			})
-		},
-		// 公司用户列表
-		table_user_ist(row){
-			this.$router.push({
-				path: '/setting/user/company-user-list',
-				query: {
-					id: row.id,
-					name:row.name
-				}
-			})
-		},
+
 		//表格选择后回调事件
 		selectionChange(selection){
 			this.selection = selection;
 		},
-		// 状态
-		changeSwitch(val, row) {
-			row.$switch_yx = true;
-			setTimeout(async () => {
-				let params = {
-					id: row.id,
-					status: row.active_status,
-				};
-				const res = await this.$API.system.company.status.post(params);
-				if(res.code !=200){
-					row.active_status = !row.active_status;
-				}
-				delete row.$switch_status;
-				delete row.$switch_yx;
-			}, 500);
-		},
 		// 下载导出
 		exportChangeShow(params){
-			if(params.type == 11){
+			if(params.type == 33){
 				this.exportShow = params.status==0?true:false
 			}
+			console.log('我接受的消息：',params.type, params.status,this.exportShow)
 		},
 		async exportData() {
 			if(this.exportShow) return
-			const res = await this.$API.orders.order.maintenance.export.post(this.params);
+			const res = await this.$API.setup.bom.export.post(this.params);
 			if(res.code == 200){
 				this.$message.success('开始导出');
 			}
diff --git a/src/views/setting/log/components/ability.vue b/src/views/setting/log/components/ability.vue
index 4c27fad..3cb947f 100644
--- a/src/views/setting/log/components/ability.vue
+++ b/src/views/setting/log/components/ability.vue
@@ -8,7 +8,7 @@
 					<el-button :size="size" type="primary" icon="el-icon-search" @click="upSearch">查询</el-button>
 					<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
 					<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="8">
-						<el-button v-auth="'sysLogExport'" :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>
+						<el-button v-auth="'sysLogExport'" :size="size" icon="sc-icon-Download" :disabled="exportShow" @click="exportData">下载</el-button>
 					</scExport>
 				</div>
 			</div>
diff --git a/src/views/setting/log/components/command.vue b/src/views/setting/log/components/command.vue
index 3664607..6252ab1 100644
--- a/src/views/setting/log/components/command.vue
+++ b/src/views/setting/log/components/command.vue
@@ -7,8 +7,8 @@
 				<div class="searchItem searchBtn">
 					<el-button :size="size" type="primary" icon="el-icon-search" @click="upSearch">查询</el-button>
 					<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
-					<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="8">
-						<el-button v-auth="'sysLogCommandExport'" :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>
+					<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="32">
+						<el-button v-auth="'sysLogCommandExport'" :size="size" :disabled="exportShow" icon="sc-icon-Download" @click="exportData">下载</el-button>
 					</scExport>
 				</div>
 			</div>
@@ -56,7 +56,7 @@ export default {
 		},
 		// 下载导出
 		exportChangeShow(params){
-			if(params.type == 8){
+			if(params.type == 32){
 				this.exportShow = params.status==0?true:false
 			}
 		},
diff --git a/src/views/setting/role/save.vue b/src/views/setting/role/save.vue
index 1fc626e..3fb9b65 100644
--- a/src/views/setting/role/save.vue
+++ b/src/views/setting/role/save.vue
@@ -1,6 +1,6 @@
 <template>
 	<el-dialog :title="titleMap[mode]" v-model="visible" :width="500" draggable destroy-on-close @closed="$emit('closed')">
-		<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="right">
+		<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="90px" label-position="right">
 			<el-form-item label="角色名称" prop="role_name">
 				<el-input v-model="form.role_name" placeholder="请填写角色名称" clearable></el-input>
 			</el-form-item>
diff --git a/src/views/setting/user/index.vue b/src/views/setting/user/index.vue
index fff872a..ec5d402 100644
--- a/src/views/setting/user/index.vue
+++ b/src/views/setting/user/index.vue
@@ -23,7 +23,7 @@
 		<el-container class="mainHeaderNoBorderPadding">
 			<el-header style="padding-left: 10px;">
 				<div class="left-panel">
-					<el-button type="primary" plain v-auth="'addDept'" :size="size" icon="el-icon-plus" @click="addDept">新增分组</el-button>
+					<el-button type="primary" plain v-auth="'addDept'" :size="size" @click="addDept">新增分组</el-button>
 					<el-button type="primary" v-auth="'userCreate'" :size="size" icon="el-icon-plus" @click="add">新增用户</el-button>
 					<el-button type="danger" v-auth="'delUser'" plain :size="size" icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
 					<el-button type="primary" v-auth="'addUserRoles'" plain :size="size" :disabled="selection.length==0" @click="role">分配角色</el-button>
@@ -40,7 +40,7 @@
 				<div class="right-panel">
 					<div class="right-panel-search">
 						<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="7">
-							<el-button :size="size" v-auth="'userExport'" icon="sc-icon-Download" @click="exportData">下载</el-button>
+							<el-button :size="size" v-auth="'userExport'" icon="sc-icon-Download" :disabled="exportShow" @click="exportData">下载</el-button>
 						</scExport>
 					</div>
 				</div>