diff --git a/src/views/earlyManager/index.vue b/src/views/earlyManager/index.vue
index 5d2e8c9..230810f 100644
--- a/src/views/earlyManager/index.vue
+++ b/src/views/earlyManager/index.vue
@@ -23,11 +23,11 @@
 					</el-select>
 				</div>
 				<div class="searchItem searchBtn">
-					<el-button :size="size" type="primary" icon="el-icon-search" @click="upsearch">查询</el-button>
+					<el-button :size="size" type="primary" icon="el-icon-search" @click="upSearch">查询</el-button>
 					<el-button :size="size" type="info" icon="el-icon-RefreshRight">重置</el-button>
 				</div>
 			</div>
-			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" stripe :size="size">
+			<scTable ref="table" :apiObj="list.apiObj" row-key="id" @selection-change="selectionChange" stripe :size="size">
 				<el-table-column label="序号" type="index" width="50"></el-table-column>
 				<el-table-column label="工单号" prop="order_sn" width="150"></el-table-column>
 				<el-table-column label="别名" prop="alias" width="200"></el-table-column>
@@ -39,17 +39,18 @@
 					</template>
 				</el-table-column>
 				<el-table-column label="备注" prop="remark" min-width="150"></el-table-column>
-				<el-table-column label="操作" fixed="right" align="right" width="170">
+				<el-table-column label="操作" fixed="right" align="center" width="150">
 					<template #default="scope">
-						<el-button-group>
-							<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
-							<el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button>
-							<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
-								<template #reference>
-									<el-button text type="primary" size="small">删除</el-button>
-								</template>
-							</el-popconfirm>
-						</el-button-group>
+						<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 @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除</el-dropdown-item>
+								</el-dropdown-menu>
+							</template>
+						</el-dropdown>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -83,7 +84,10 @@ export default {
 				save: false,
 				permission: false
 			},
-			apiObj: this.$API.orders.order.list,
+			list:{
+				apiObj: {},
+				column:[]
+			},
 			selection: [],
 			params: {
 				keyword: null
@@ -121,8 +125,8 @@ export default {
 		},
 		//删除
 		async table_del(row){
-			var reqData = {id: row.id}
-			var res = await this.$API.demo.post.post(reqData);
+			const reqData = {id: row.id};
+			const res = await this.$API.demo.post.post(reqData);
 			if(res.code == 200){
 				this.$refs.table.refresh()
 				this.$message.success("删除成功")
@@ -130,7 +134,7 @@ export default {
 		},
 		//批量删除
 		async batch_del(){
-			this.$confirm(`确定删除选中的 ${this.selection.length} 项吗？如果删除项中含有子集将会被一并删除`, '提示', {
+			this.$confirm(`确定删除选中的 ${this.selection.length} 项吗？`, '提示', {
 				type: 'warning'
 			}).then(() => {
 				const loading = this.$loading();
@@ -156,25 +160,10 @@ export default {
 			}, 500)
 		},
 		//搜索
-		upsearch(){
+		upSearch(){
 
 		},
-		//根据ID获取树结构
-		filterTree(id){
-			var target = null;
-			function filter(tree){
-				tree.forEach(item => {
-					if(item.id == id){
-						target = item
-					}
-					if(item.children){
-						filter(item.children)
-					}
-				})
-			}
-			filter(this.$refs.table.tableData)
-			return target
-		},
+
 		//本地更新数据
 		handleSaveSuccess(data, mode){
 			if(mode=='add'){
diff --git a/src/views/setting/log/index.vue b/src/views/setting/log/index.vue
index 5863c8e..d40ff7f 100644
--- a/src/views/setting/log/index.vue
+++ b/src/views/setting/log/index.vue
@@ -1,25 +1,35 @@
 <template>
 	<el-container>
-		<el-aside width="220px">
-			<el-tree ref="category" class="menu" node-key="label" :data="category" :default-expanded-keys="['系统日志']" current-node-key="系统日志" :highlight-current="true" :expand-on-click-node="false">
-			</el-tree>
-		</el-aside>
-		<el-container>
+<!--		<el-aside width="220px">-->
+<!--			<el-tree ref="category" class="menu" node-key="label" :data="category" :default-expanded-keys="['系统日志']" current-node-key="系统日志" :highlight-current="true" :expand-on-click-node="false">-->
+<!--			</el-tree>-->
+<!--		</el-aside>-->
+		<el-container class="mainBox mainBoxHeaderNoBorder">
 			<el-main class="nopadding">
 				<el-container>
-					<el-header>
-						<div class="left-panel">
-							<el-date-picker v-model="date" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-						</div>
-						<div class="right-panel">
+<!--					<el-header>-->
+<!--						<div class="left-panel">-->
 
-						</div>
-					</el-header>
-					<el-header style="height:150px;">
-						<scEcharts height="100%" :option="logsChartOption"></scEcharts>
-					</el-header>
+<!--						</div>-->
+<!--						<div class="right-panel">-->
+
+<!--						</div>-->
+<!--					</el-header>-->
+<!--					<el-header style="height:150px;">-->
+<!--						<scEcharts height="100%" :option="logsChartOption"></scEcharts>-->
+<!--					</el-header>-->
 					<el-main class="nopadding">
-						<scTable ref="table" :apiObj="apiObj" stripe highlightCurrentRow @row-click="rowClick">
+						<div class="searchMain">
+							<div class="searchItem">
+								<label class="name">时间</label>
+								<el-date-picker class="input" type="datetimerange" :size="size" v-model="date" align="right" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" clearable></el-date-picker>
+							</div>
+							<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">重置</el-button>
+							</div>
+						</div>
+						<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow @row-click="rowClick">
 							<el-table-column label="级别" prop="level" width="60">
 								<template #default="scope">
 									<el-icon v-if="scope.row.level=='error'" style="color: #F56C6C;"><el-icon-circle-close-filled /></el-icon>
@@ -58,6 +68,8 @@
 		},
 		data() {
 			return {
+				size:"small",
+
 				infoDrawer: false,
 				logsChartOption: {
 					color: ['#409eff','#e6a23c','#f56c6c'],
@@ -118,7 +130,10 @@
 					}
 				],
 				date: [],
-				apiObj: this.$API.system.log.list,
+				list:{
+					apiObj: {},
+					column:[]
+				},
 				search: {
 					keyword: ""
 				}
diff --git a/src/views/setting/partsMag/index.vue b/src/views/setting/partsMag/index.vue
index 350f8e7..20da2cf 100644
--- a/src/views/setting/partsMag/index.vue
+++ b/src/views/setting/partsMag/index.vue
@@ -1,26 +1,186 @@
 <template>
-	<view>
+	<el-container class="mainBox mainHeaderNoBorderPadding">
+		<el-header>
+			<div class="left-panel">
+				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增备件</el-button>
+				<el-button type="primary" :size="size" plain>批量导入</el-button>
+			</div>
+			<div class="right-panel">
+
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<div class="searchMain searchMainNoTop">
+				<div class="searchItem">
+					<label class="name">操作时间</label>
+					<el-date-picker class="input" type="daterange" :size="size" v-model="params.keyword" align="right" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" clearable></el-date-picker>
+				</div>
+				<div class="searchItem">
+					<label class="name">物料编码</label>
+					<el-input class="input" :size="size" v-model="params.keyword" placeholder="请输入物料编码" clearable></el-input>
+				</div>
+				<div class="searchItem">
+					<label class="name">物料名称</label>
+					<el-input class="input" :size="size" v-model="params.keyword" placeholder="请输入物料名称" clearable></el-input>
+				</div>
+				<div class="searchItem">
+					<label class="name">规格型号</label>
+					<el-input class="input" :size="size" v-model="params.keyword" placeholder="请输入规格型号" clearable></el-input>
+				</div>
+				<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">重置</el-button>
+				</div>
+			</div>
+			<scTable ref="table" :apiObj="list.apiObj" row-key="id" @selection-change="selectionChange" stripe :size="size">
+				<el-table-column label="序号" type="index" width="50"></el-table-column>
+				<el-table-column label="工单号" prop="order_sn" width="150"></el-table-column>
+				<el-table-column label="别名" prop="alias" width="200"></el-table-column>
+				<el-table-column label="排序" prop="sort" width="80"></el-table-column>
+				<el-table-column label="创建时间" prop="date" width="180"></el-table-column>
+				<el-table-column label="状态" prop="status" width="80">
+					<template #default="scope">
+						<el-switch v-model="scope.row.status" :size="size" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" prop="remark" min-width="150"></el-table-column>
+				<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 @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>
+
+	<!--	<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" @closed="dialog.save=false"></save-dialog>-->
+
+	<!--	<permission-dialog v-if="dialog.permission" ref="permissionDialog" @closed="dialog.permission=false"></permission-dialog>-->
 
-	</view>
 </template>
 
 <script>
-export default {
-	name: "index",
-	data(){
-		return{
+// import saveDialog from './save'
+// import permissionDialog from './permission'
 
+export default {
+	name: 'document',
+	components: {
+		// saveDialog,
+		// permissionDialog
+	},
+	data() {
+		return {
+			size:'small',
+			setMap:{
+				status:[]
+			},
+
+			dialog: {
+				save: false,
+				permission: false
+			},
+			list:{
+				apiObj: {},
+				column:[]
+			},
+			selection: [],
+			params: {
+				keyword: null
+			}
 		}
 	},
-	mounted() {
+	methods: {
+		//添加
+		add(){
+			this.dialog.save = true
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open()
+			})
+		},
+		//编辑
+		table_edit(row){
+			this.dialog.save = true
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open('edit').setData(row)
+			})
+		},
+		//查看
+		table_show(row){
+			this.dialog.save = true
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open('show').setData(row)
+			})
+		},
+		//权限设置
+		permission(){
+			this.dialog.permission = true
+			this.$nextTick(() => {
+				this.$refs.permissionDialog.open()
+			})
+		},
+		//删除
+		async table_del(row){
+			const reqData = {id: row.id};
+			const res = await this.$API.demo.post.post(reqData);
+			if(res.code == 200){
+				this.$refs.table.refresh()
+				this.$message.success("删除成功")
+			}
+		},
+		//批量删除
+		async batch_del(){
+			this.$confirm(`确定删除选中的 ${this.selection.length} 项吗？`, '提示', {
+				type: 'warning'
+			}).then(() => {
+				const loading = this.$loading();
+				this.$refs.table.refresh()
+				loading.close();
+				this.$message.success("操作成功")
+			}).catch(() => {
 
-	},
-	methods:{
+			})
+		},
+		//表格选择后回调事件
+		selectionChange(selection){
+			this.selection = selection;
+		},
+		//表格内开关
+		changeSwitch(val, row){
+			row.status = row.status == '1'?'0':'1'
+			row.$switch_status = true;
+			setTimeout(()=>{
+				delete row.$switch_status;
+				row.status = val;
+				this.$message.success("操作成功")
+			}, 500)
+		},
+		//搜索
+		upSearch(){
 
+		},
+
+		//本地更新数据
+		handleSaveSuccess(data, mode){
+			if(mode=='add'){
+				this.$refs.table.refresh()
+			}else if(mode=='edit'){
+				this.$refs.table.refresh()
+			}
+		}
 	}
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 
 </style>
diff --git a/src/views/setting/role/index.vue b/src/views/setting/role/index.vue
index 91516d9..dc656f1 100644
--- a/src/views/setting/role/index.vue
+++ b/src/views/setting/role/index.vue
@@ -3,7 +3,7 @@
 		<el-header>
 			<div class="left-panel">
 				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新建</el-button>
-				<el-button type="danger" :size="size" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del">删除</el-button>
+				<el-button type="danger" :size="size" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
 				<el-button type="primary" :size="size" plain :disabled="selection.length!=1" @click="permission">权限设置</el-button>
 			</div>
 			<div class="right-panel">
diff --git a/src/views/setting/warehouse/index.vue b/src/views/setting/warehouse/index.vue
index 350f8e7..cf08666 100644
--- a/src/views/setting/warehouse/index.vue
+++ b/src/views/setting/warehouse/index.vue
@@ -1,26 +1,181 @@
 <template>
-	<view>
+	<el-container class="mainBox mainBoxHeaderNoBorder">
+		<el-main class="nopadding">
+			<div class="searchMain">
+				<div class="searchItem">
+					<label class="name">时间</label>
+					<el-date-picker class="input" type="daterange" :size="size" v-model="params.keyword" align="right" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" clearable></el-date-picker>
+				</div>
+				<div class="searchItem">
+					<label class="name">工单号</label>
+					<el-input class="input" :size="size" v-model="params.keyword" placeholder="工单号" clearable></el-input>
+				</div>
+				<div class="searchItem">
+					<label class="name">维保供应商</label>
+					<el-select class="input" :size="size" v-model="params.keyword" placeholder="维保供应商" clearable>
+						<el-option v-for="item in setMap.status" :key="item" :label="item.name" :value="item.value"></el-option>
+					</el-select>
+				</div>
+				<div class="searchItem">
+					<label class="name">状态</label>
+					<el-select class="input" :size="size" v-model="params.keyword" placeholder="状态" clearable>
+						<el-option v-for="item in setMap.status" :key="item" :label="item.name" :value="item.value"></el-option>
+					</el-select>
+				</div>
+				<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">重置</el-button>
+				</div>
+			</div>
+			<scTable ref="table" :apiObj="list.apiObj" row-key="id" @selection-change="selectionChange" stripe :size="size">
+				<el-table-column label="序号" type="index" width="50"></el-table-column>
+				<el-table-column label="工单号" prop="order_sn" width="150"></el-table-column>
+				<el-table-column label="别名" prop="alias" width="200"></el-table-column>
+				<el-table-column label="排序" prop="sort" width="80"></el-table-column>
+				<el-table-column label="创建时间" prop="date" width="180"></el-table-column>
+				<el-table-column label="状态" prop="status" width="80">
+					<template #default="scope">
+						<el-switch v-model="scope.row.status" :size="size" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" prop="remark" min-width="150"></el-table-column>
+				<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 @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>
+
+	<!--	<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" @closed="dialog.save=false"></save-dialog>-->
+
+	<!--	<permission-dialog v-if="dialog.permission" ref="permissionDialog" @closed="dialog.permission=false"></permission-dialog>-->
 
-	</view>
 </template>
 
 <script>
-export default {
-	name: "index",
-	data(){
-		return{
+// import saveDialog from './save'
+// import permissionDialog from './permission'
 
+export default {
+	name: 'index',
+	components: {
+		// saveDialog,
+		// permissionDialog
+	},
+	data() {
+		return {
+			size:'small',
+			setMap:{
+				status:[]
+			},
+
+			dialog: {
+				save: false,
+				permission: false
+			},
+			list:{
+				apiObj: {},
+				column:[]
+			},
+			selection: [],
+			params: {
+				keyword: null
+			}
 		}
 	},
-	mounted() {
+	methods: {
+		//添加
+		add(){
+			this.dialog.save = true
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open()
+			})
+		},
+		//编辑
+		table_edit(row){
+			this.dialog.save = true
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open('edit').setData(row)
+			})
+		},
+		//查看
+		table_show(row){
+			this.dialog.save = true
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open('show').setData(row)
+			})
+		},
+		//权限设置
+		permission(){
+			this.dialog.permission = true
+			this.$nextTick(() => {
+				this.$refs.permissionDialog.open()
+			})
+		},
+		//删除
+		async table_del(row){
+			const reqData = {id: row.id};
+			const res = await this.$API.demo.post.post(reqData);
+			if(res.code == 200){
+				this.$refs.table.refresh()
+				this.$message.success("删除成功")
+			}
+		},
+		//批量删除
+		async batch_del(){
+			this.$confirm(`确定删除选中的 ${this.selection.length} 项吗？`, '提示', {
+				type: 'warning'
+			}).then(() => {
+				const loading = this.$loading();
+				this.$refs.table.refresh()
+				loading.close();
+				this.$message.success("操作成功")
+			}).catch(() => {
 
-	},
-	methods:{
+			})
+		},
+		//表格选择后回调事件
+		selectionChange(selection){
+			this.selection = selection;
+		},
+		//表格内开关
+		changeSwitch(val, row){
+			row.status = row.status == '1'?'0':'1'
+			row.$switch_status = true;
+			setTimeout(()=>{
+				delete row.$switch_status;
+				row.status = val;
+				this.$message.success("操作成功")
+			}, 500)
+		},
+		//搜索
+		upSearch(){
 
+		},
+
+		//本地更新数据
+		handleSaveSuccess(data, mode){
+			if(mode=='add'){
+				this.$refs.table.refresh()
+			}else if(mode=='edit'){
+				this.$refs.table.refresh()
+			}
+		}
 	}
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 
 </style>