diff --git a/src/views/businessManagement/ordinary.vue b/src/views/businessManagement/ordinary.vue
index 3b4cdc3..1f9d405 100644
--- a/src/views/businessManagement/ordinary.vue
+++ b/src/views/businessManagement/ordinary.vue
@@ -45,8 +45,10 @@
 
         <el-button v-show="permission.ordinaryClose && row.status == 101" @click="handleClone(row)">关闭</el-button>
         <el-button v-show="permission.ordinaryConfirm && row.status == 201" @click="reciveOrder(row)">确认</el-button>
+        <!-- 维修人员驳回 -->
         <el-button v-show="permission.ordinaryRefuse && row.status == 201" @click="repairReject(row)">驳回</el-button>
 
+
         <el-button @click="handleExport(row)"
           v-show="row.status == 104 || row.status == 403 || row.status == 202 || row.status == 203 || row.status == 204">报告</el-button>
 
@@ -1572,20 +1574,20 @@ export default {
     handleReject() {
       this.$refs.rejectForm.validate((valid) => {
         if (valid) {
-          if (this.role_id == '1839552581620793346') {
-            let query = {
-              id: this.rejectForm.id,
-              repaiRejectReason: this.rejectForm.reason
-            }
-            servicemanReject(query).then(res => {
-              if (res.data.code == 200) {
-                this.$message.success('驳回成功')
-                this.rejectForm = {}
-                this.rejectVisible = false
-                this.onLoad()
-              }
-            })
+          // if (this.role_id == '1839552581620793346') {
+          let query = {
+            id: this.rejectForm.id,
+            repaiRejectReason: this.rejectForm.reason
           }
+          servicemanReject(query).then(res => {
+            if (res.data.code == 200) {
+              this.$message.success('驳回成功')
+              this.rejectForm = {}
+              this.rejectVisible = false
+              this.onLoad()
+            }
+          })
+          // }
         }
       })
 
@@ -1715,7 +1717,23 @@ export default {
                 this.$message.error('请至少填写一条维修材料信息')
               } else {
                 let data = []
+                let goodsList = []
                 this.tableData.map((item, index) => {
+                  goodsList.push({
+                    productId: item.id,
+                    productName: item.productName,
+                    applyNum: item.number,
+                    orderId: this.repairForm.id,
+                    materialName: item.productName,
+                    materialCount: item.number,
+                    materialPrice: item.price,
+                    bigClassId: item.productType.node,
+                    rule: item.rule,
+                    unit: item.unit,
+                    xh: item.xh,
+                    inventoryId: item.inventoryId
+                    //  outNum:""
+                  })
                   data.push({
                     orderId: this.repairForm.id,
                     materialName: item.productName,
@@ -1746,14 +1764,15 @@ export default {
                   query.discount = 0
 
                 }
+
                 let query1 = {
-                  details: data,
+                  details: goodsList,
                   applyUserId: this.userInfo.user_id,							//申领人Id
                   applyUser: this.userInfo.user_name,								//申领人
                   applyTime: moment().format('YYYY-MM-DD HH:mm:ss'),							//申领时间(yyyy-MM-dd HH:mm:ss)
                   status: 0,
-                  workId: this.addForm.id,
-                  remark:'维修单申领'
+                  workId: this.repairForm.id,
+                  remark: '维修单申领'
                 }
 
                 editData(query).then(res => {
@@ -2015,15 +2034,15 @@ export default {
                   workId: this.addForm.id,
                 }
                 // applyGoods(query1).then(res => {
-                  if (res.data.code == 200) {
-                    servicemanReceive({ id: this.addForm.id }).then(res => {
-                      if (res.data.code == 200) {
-                        this.$message.success('提交成功')
-                        this.dialogVisible = false
-                        this.onLoad()
-                      }
-                    })
-                  }
+                if (res.data.code == 200) {
+                  servicemanReceive({ id: this.addForm.id }).then(res => {
+                    if (res.data.code == 200) {
+                      this.$message.success('提交成功')
+                      this.dialogVisible = false
+                      this.onLoad()
+                    }
+                  })
+                }
                 // })
               }
             } else {
diff --git a/src/views/device/deviceSystem.vue b/src/views/device/deviceSystem.vue
index 2b1bf05..3fcf3b6 100644
--- a/src/views/device/deviceSystem.vue
+++ b/src/views/device/deviceSystem.vue
@@ -127,8 +127,8 @@
                 format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="请选择生产时间">
               </el-date-picker>
             </el-form-item> -->
-            <el-form-item label="描述" prop="supplier">
-              <el-input style="width: 98%;" :disabled="viewType == 'view'" placeholder="请输入描述"
+            <el-form-item label="备注" prop="supplier">
+              <el-input style="width: 98%;" :disabled="viewType == 'view'" placeholder="请输入备注"
                 v-model="addForm.description"></el-input>
             </el-form-item>
             <el-form-item label="关联实验室" prop="lab">
diff --git a/src/views/goodsManagement/reciviceList.vue b/src/views/goodsManagement/reciviceList.vue
index d68a028..8eff71c 100644
--- a/src/views/goodsManagement/reciviceList.vue
+++ b/src/views/goodsManagement/reciviceList.vue
@@ -12,7 +12,7 @@
           <el-table-column label="型号" prop="xh"></el-table-column>
           <el-table-column label="参数" prop="rule"></el-table-column>
           <el-table-column label="申领数量" prop="applyNum"></el-table-column>
-          <el-table-column label="出库数量" prop="outNum"></el-table-column>
+          <el-table-column label="实际出库数量" prop="outNum"></el-table-column>
           <el-table-column label="归还日期" prop="returnTime"></el-table-column>
         </el-table>
       </template>
@@ -57,7 +57,7 @@
           <el-table-column label="型号" :resizable="false" prop="xh"></el-table-column>
           <el-table-column label="参数" :resizable="false" prop="rule"></el-table-column>
           <el-table-column label="申领数量" :resizable="false" prop="applyNum"></el-table-column>
-          <el-table-column label="出库数量" :resizable="false" prop="outNum" v-if="receiveForm.status != 0">
+          <el-table-column label="实际出库数量" :resizable="false" prop="outNum" v-if="receiveForm.status != 0">
             <template slot-scope="scope">
               <el-input-number @change="changeCount(scope.row)" :disabled="viewType != 'import'" style="width:98%"
                 :min="0" :max="scope.row.applyNum" v-model="scope.row.outNum" label="出库数量"></el-input-number>
diff --git a/src/views/labManagement/inspectionManagement.vue b/src/views/labManagement/inspectionManagement.vue
index 14bdffa..69d7d8a 100644
--- a/src/views/labManagement/inspectionManagement.vue
+++ b/src/views/labManagement/inspectionManagement.vue
@@ -1,46 +1,43 @@
 <template>
-	<el-row>
+  <el-row>
 
-		<el-col :span="24">
-			<basic-container>
-				<avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
-					v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate"
-					@row-save="rowSave" :before-open="beforeOpen" :page.sync="page" @search-change="searchChange"
-					@search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
-					@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
-					<template slot-scope="scope" slot="menuLeft">
-						<el-button v-show="permission.contentAdd" type="primary" size="small"
-							@click="handleAdd">新建</el-button>
-					</template>
-					<template slot-scope="{ row }" slot="isOpen">
-						<el-tag :type="row.isOpen == 0 ? 'danger' : 'success'">{{ row.isOpen == 0 ? '停用' : '启用'
-							}}</el-tag>
-					</template>
-					<template slot-scope="{ row }" slot="menu">
-						<el-button v-show="permission.contentView" @click="handleView(row)">查看</el-button>
-						<el-button v-show="permission.contentEdit" @click="handleEdit(row)">编辑</el-button>
-						<el-button @click="startPlan(row)"
-							v-show="row.isOpen == 0 && permission.contentSetting">启用</el-button>
-						<el-button @click="stopPlan(row)"
-							v-show="row.isOpen == 1 && permission.contentSetting">停用</el-button>
-						<el-button @click="deletePlan(row)" v-show="permission.contentDelete">删除</el-button>
-						<el-button @click="handleDownload(row)"
-							v-show="permission.contentDelete">下载</el-button>
-              <el-button type="primary" @click="handleExportDevice(row)">导出</el-button>
-						<!-- <el-button @click="handleImport(row)">导入</el-button> -->
-					</template>
-				</avue-crud>
-				<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" :append-to-body="true" width="70%" :close-on-click-modal="false">
-					<addDialog :unitData="unitData" :title="dialogTitle" :detailForm="detailForm" ref="addDialog">
-					</addDialog>
-					<span slot="footer" class="dialog-footer">
-						<el-button @click="handleCancel">取 消</el-button>
-						<el-button v-show="dialogTitle != '查看'" type="primary" @click="handleConfirm">提 交</el-button>
-					</span>
-				</el-dialog>
-			</basic-container>
-		</el-col>
-	</el-row>
+    <el-col :span="24">
+      <basic-container>
+        <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
+          v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
+          :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
+          @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+          @refresh-change="refreshChange" @on-load="onLoad">
+          <template slot-scope="scope" slot="menuLeft">
+            <el-button v-show="permission.contentAdd" type="primary" size="small" @click="handleAdd">新建</el-button>
+          </template>
+          <template slot-scope="{ row }" slot="isOpen">
+            <el-tag :type="row.isOpen == 0 ? 'danger' : 'success'">{{ row.isOpen == 0 ? '停用' : '启用'
+              }}</el-tag>
+          </template>
+          <template slot-scope="{ row }" slot="menu">
+            <el-button v-show="permission.contentView" @click="handleView(row)">查看</el-button>
+            <el-button v-show="permission.contentEdit" @click="handleEdit(row)">编辑</el-button>
+            <el-button @click="startPlan(row)" v-show="row.isOpen == 0 && permission.contentSetting">启用</el-button>
+            <el-button @click="stopPlan(row)" v-show="row.isOpen == 1 && permission.contentSetting">停用</el-button>
+            <el-button @click="deletePlan(row)" v-show="permission.contentDelete">删除</el-button>
+            <el-button @click="handleDownload(row)" v-show="permission.contentDelete">下载</el-button>
+            <el-button type="primary" @click="handleExportDevice(row)">导出</el-button>
+            <!-- <el-button @click="handleImport(row)">导入</el-button> -->
+          </template>
+        </avue-crud>
+        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" :append-to-body="true" width="70%"
+          :close-on-click-modal="false">
+          <addDialog :unitData="unitData" :title="dialogTitle" :detailForm="detailForm" ref="addDialog">
+          </addDialog>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="handleCancel">取 消</el-button>
+            <el-button v-show="dialogTitle != '查看'" type="primary" @click="handleConfirm">提 交</el-button>
+          </span>
+        </el-dialog>
+      </basic-container>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
@@ -49,337 +46,341 @@ import { mapGetters } from "vuex";
 import JSZip from 'jszip';
 import { saveAs } from 'file-saver';
 import { getLimsTree, planCreate, getContentList, getPlanDetail, dealPlan, deletePlan, editPlan } from '@/api/labManagement/inspectionManagement'
-import {  exportBlob1 } from "@/api/common";
+import { exportBlob1 } from "@/api/common";
 import { downloadXls } from "@/util/util";
 export default {
-	components: {
-		addDialog
-	},
-	data() {
-		const validatePass = (rule, value, callback) => {
-			if (value === '') {
-				callback(new Error('请输入密码'));
-			} else {
-				callback();
-			}
-		};
-		const validatePass2 = (rule, value, callback) => {
-			if (value === '') {
-				callback(new Error('请再次输入密码'));
-			} else if (value !== this.form.password) {
-				callback(new Error('两次输入密码不一致!'));
-			} else {
-				callback();
-			}
-		};
-		return {
-			dialogTitle: '',
-			form: {},
-			search: {},
-			roleBox: false,
-			excelBox: false,
-			platformBox: false,
-			initFlag: true,
-			selectionList: [],
-			query: {},
-			loading: true,
-			platformLoading: false,
-			page: {
-				pageSize: 10,
-				currentPage: 1,
-				total: 0
-			},
-			platformPage: {
-				pageSize: 10,
-				currentPage: 1,
-				total: 0
-			},
-			init: {
-				roleTree: [],
-				deptTree: [],
-			},
-			props: {
-				label: "title",
-				value: "key"
-			},
-			roleGrantList: [],
-			roleTreeObj: [],
-			treeDeptId: '',
-			treeData: [
+  components: {
+    addDialog
+  },
+  data() {
+    const validatePass = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入密码'));
+      } else {
+        callback();
+      }
+    };
+    const validatePass2 = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请再次输入密码'));
+      } else if (value !== this.form.password) {
+        callback(new Error('两次输入密码不一致!'));
+      } else {
+        callback();
+      }
+    };
+    return {
+      dialogTitle: '',
+      form: {},
+      search: {},
+      roleBox: false,
+      excelBox: false,
+      platformBox: false,
+      initFlag: true,
+      selectionList: [],
+      query: {},
+      loading: true,
+      platformLoading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      platformPage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      init: {
+        roleTree: [],
+        deptTree: [],
+      },
+      props: {
+        label: "title",
+        value: "key"
+      },
+      roleGrantList: [],
+      roleTreeObj: [],
+      treeDeptId: '',
+      treeData: [
 
-			],
-			unitData: [],
-			treeOption: {
-				nodeKey: 'id',
+      ],
+      unitData: [],
+      treeOption: {
+        nodeKey: 'id',
 
-				addBtn: false,
-				menu: false,
-				size: 'small',
-				props: {
-					labelText: '标题',
-					label: 'title',
-					value: 'value',
-					children: 'children'
-				}
-			},
-			option: {
-				height: 'auto',
-				calcHeight: 80,
-				tip: false,
-				searchShow: true,
-				searchMenuSpan: 6,
-				border: true,
-				index: true,
-				selection: true,
-				addBtn: false,
-				viewBtn: false,
-				editBtn: false,
-				delBtn: false,
-				dialogType: 'dialog',
-				dialogClickModal: false,
-				searchShowBtn: false,
-				refreshBtn: false,
-				columnBtn: false,
-				menuWidth: 300,
+        addBtn: false,
+        menu: false,
+        size: 'small',
+        props: {
+          labelText: '标题',
+          label: 'title',
+          value: 'value',
+          children: 'children'
+        }
+      },
+      option: {
+        height: 'auto',
+        calcHeight: 80,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        selection: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        dialogType: 'dialog',
+        dialogClickModal: false,
+        searchShowBtn: false,
+        refreshBtn: false,
+        columnBtn: false,
+        menuWidth: 300,
         searchShowBtn: false,   // 栏目折叠显隐
-        refreshBtn: false,      // 刷新
-        columnBtn: false,       // 操作列显隐
-        gridBtn:false,
-        excelBtn: false,       // 导出Excel
-        printBtn: false,       // 表格打印导出
-        filterBtn: false,      // 筛选
-				column: [
-        {
-						label: "巡检计划单号",
-						labelWidth: 120,
-						prop: "planCode",
-						search: true,
-						overHidden: true,
-					},
-					{
-						label: "单位名称",
-						labelWidth: 120,
-						prop: "deptName",
-						search: true,
-						overHidden: true,
-					},
-					{
-						label: "巡检内容",
-						labelWidth: 120,
-						prop: "planContent",
-						overHidden: true,
-					},
-					{
-						label: "是否启用",
-						labelWidth: 120,
-						prop: "isOpen",
-						overHidden: true,
-						slot: true
-					},
-					{
-						label: "创建时间",
-						labelWidth: 120,
-						prop: "createTime",
-						overHidden: true,
-					},
-					// {
-					// 	label: "包含专业/设备",
-					// 	labelWidth: 120,
-					// 	prop: "major",
-					// 	labelWidth: 120,
-					// 	overHidden: true,
-					// },
-					// {
-					// 	label: "备注",
-					// 	labelWidth: 120,
-					// 	overHidden: true,
-					// 	prop: "remark",
-					// },
-				],
-			},
-			data: [],
-			dialogVisible: false,
-			addForm: {},
-			detailForm: {}
-		};
-	},
-	computed: {
-		...mapGetters(["userInfo", "permission"]),
-	},
-	mounted() {
-		this.tableData = this.mergeTableRow(this.tableData, ['majorName'])
-		console.log('userInfo--------------->', this.userInfo)
-		this.getLeftLab()
-		// if(this.userInfo.role_id == '1846419477876510721'){
-		// 	this.search.deptName = this.userInfo.deptName
-		// }
-	},
-	methods: {
+        refreshBtn: false,      // 刷新
+        columnBtn: false,       // 操作列显隐
+        gridBtn: false,
+        excelBtn: false,       // 导出Excel
+        printBtn: false,       // 表格打印导出
+        filterBtn: false,      // 筛选
+        column: [
+          {
+            label: "巡检计划单号",
+            labelWidth: 120,
+            prop: "planCode",
+            search: true,
+            overHidden: true,
+          },
+          {
+            label: "单位名称",
+            labelWidth: 120,
+            prop: "deptName",
+            search: true,
+            overHidden: true,
+          },
+          {
+            label: "巡检内容",
+            labelWidth: 120,
+            prop: "planContent",
+            overHidden: true,
+          },
+          {
+            label: "是否启用",
+            labelWidth: 120,
+            prop: "isOpen",
+            overHidden: true,
+            slot: true
+          },
+          {
+            label: "创建时间",
+            labelWidth: 120,
+            prop: "createTime",
+            overHidden: true,
+          },
+          // {
+          // 	label: "包含专业/设备",
+          // 	labelWidth: 120,
+          // 	prop: "major",
+          // 	labelWidth: 120,
+          // 	overHidden: true,
+          // },
+          // {
+          // 	label: "备注",
+          // 	labelWidth: 120,
+          // 	overHidden: true,
+          // 	prop: "remark",
+          // },
+        ],
+      },
+      data: [],
+      dialogVisible: false,
+      addForm: {},
+      detailForm: {}
+    };
+  },
+  computed: {
+    ...mapGetters(["userInfo", "permission"]),
+  },
+  mounted() {
+    this.tableData = this.mergeTableRow(this.tableData, ['majorName'])
+    console.log('userInfo--------------->', this.userInfo)
+    this.getLeftLab()
+    // if(this.userInfo.role_id == '1846419477876510721'){
+    // 	this.search.deptName = this.userInfo.deptName
+    // }
+  },
+  methods: {
     handleExportDevice(row) {
       let query = JSON.parse(JSON.stringify(row))
-        exportBlob1(`/api/lab-ops/maintenance/maintenance-plan-report`, query).then(res => {
-          downloadXls(res.data, "巡检计划.xlsx");
-        })
+      exportBlob1(`/api/lab-ops/maintenance/maintenance-plan-report`, query).then(res => {
+        downloadXls(res.data, "巡检计划.xlsx");
+      })
     },
-		objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-			// console.log('row--------------->',row)
-			// console.log('column--------------->',column)
-			// console.log('rowIndex--------------->',rowIndex)
-			// console.log('columnIndex--------------->',columnIndex)
-			const span = column['property'] + '-span'
-			if (row[span]) {
-				return row[span]
-			}
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      // console.log('row--------------->',row)
+      // console.log('column--------------->',column)
+      // console.log('rowIndex--------------->',rowIndex)
+      // console.log('columnIndex--------------->',columnIndex)
+      const span = column['property'] + '-span'
+      if (row[span]) {
+        return row[span]
+      }
 
-		},
-		// 启用计划
-		startPlan(row) {
-			this.$confirm('确定启用该计划?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then(() => {
-				dealPlan({ id: row.id, isOpen: 1 }).then(res => {
-					if (res.data.code == 200) {
-						this.$message.success('启用成功')
-						this.onLoad()
-					}
-				})
-			})
-		},
-		// 停用计划
-		stopPlan(row) {
-			this.$confirm('确定停用该计划?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then(() => {
-				dealPlan({ id: row.id, isOpen: 0 }).then(res => {
-					if (res.data.code == 200) {
-						this.$message.success('停用成功')
-						this.onLoad()
-					}
-				})
-			})
-		},
-		deletePlan(row) {
-			this.$confirm('确定删除该计划?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then(() => {
-				deletePlan({ ids: row.id }).then(res => {
-					if (res.data.code == 200) {
-						this.$message.success('删除成功')
-						this.onLoad()
-					}
-				})
-			})
-		},
-		getFile(url) {
-			return new Promise((resolve, reject) => {
-				//通过请求获取文件blob格式
-				let xmlhttp = new XMLHttpRequest();
-				xmlhttp.open("GET", url, true);
-				xmlhttp.responseType = "blob";
-				xmlhttp.onload = function () {
-				if (xmlhttp.status == 200) {
-					resolve(xmlhttp.response);
-				} else {
-					reject(xmlhttp.response);
-				}
-				};
-				xmlhttp.send();
-			});
-		},
-		// 下载
-		handleDownload(row) {
-			getPlanDetail({ id: row.id }).then(res => {
-				let data = res.data.data.attaches
-				if (data.length > 1) {
-					const zip = new JSZip();
-					// 下载后压缩包的名称
-					const blogTitle = '合同.zip'
-					const cache = {};
-					const promises = [];
-					data.forEach(item => {
-						if (item.link) {
-							const promise = this.getFile(item.link).then(data => {
-								// *下载文件, 并存成ArrayBuffer对象
-								const arr_name = item.name.split("/");
-								const file_name = arr_name[arr_name.length - 1]; // *获取文件名
-								zip.file(file_name, data, { binary: true }); // *逐个添加文件
-								cache[file_name] = data;
-							});
-							promises.push(promise);
-						}
-					});
-					Promise.all(promises).then(() => {
-						zip.generateAsync({
-							type: "blob", compression: 'DEFLATE',  // *STORE: 默认不压缩; DEFLATE：需要压缩
-							compressionOptions: {
-								level: 9 // *压缩等级 1~9。1: 压缩速度最快，9: 最优压缩方式
-							}
-						}).then(content => {
-							saveAs(content, blogTitle); // *生成二进制流，利用file-saver保存文件，文件名自定义
-						});
-					});
-				} else if (data.length == 1) {
-					fetch(data[0].link, {
-						method: 'get',
-						heanders: {
-							'Content-Type': 'application/json;charset=UTF-8'
-						}
-					})
-						.then(res => res.blob())
-						.then(blob => {
-							const link = document.createElement('a')
-							link.style.display = 'none'
-							link.download = data[0].name// 设置下载属性 以及文件名
-							link.href = URL.createObjectURL(blob)
+    },
+    // 启用计划
+    startPlan(row) {
+      this.$confirm('确定启用该计划?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        dealPlan({ id: row.id, isOpen: 1 }).then(res => {
+          if (res.data.code == 200) {
+            this.$message.success('启用成功')
+            this.onLoad()
+          }
+        })
+      })
+    },
+    // 停用计划
+    stopPlan(row) {
+      this.$confirm('确定停用该计划?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        dealPlan({ id: row.id, isOpen: 0 }).then(res => {
+          if (res.data.code == 200) {
+            this.$message.success('停用成功')
+            this.onLoad()
+          }
+        })
+      })
+    },
+    deletePlan(row) {
+      if (row.isOpen == 1) {
+        this.$message.error('请先停用巡检计划！')
+        return false
+      }
+      this.$confirm('确定删除该计划?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deletePlan({ ids: row.id }).then(res => {
+        	if (res.data.code == 200) {
+        		this.$message.success('删除成功')
+        		this.onLoad()
+        	}
+        })
+      })
+    },
+    getFile(url) {
+      return new Promise((resolve, reject) => {
+        //通过请求获取文件blob格式
+        let xmlhttp = new XMLHttpRequest();
+        xmlhttp.open("GET", url, true);
+        xmlhttp.responseType = "blob";
+        xmlhttp.onload = function () {
+          if (xmlhttp.status == 200) {
+            resolve(xmlhttp.response);
+          } else {
+            reject(xmlhttp.response);
+          }
+        };
+        xmlhttp.send();
+      });
+    },
+    // 下载
+    handleDownload(row) {
+      getPlanDetail({ id: row.id }).then(res => {
+        let data = res.data.data.attaches
+        if (data.length > 1) {
+          const zip = new JSZip();
+          // 下载后压缩包的名称
+          const blogTitle = '合同.zip'
+          const cache = {};
+          const promises = [];
+          data.forEach(item => {
+            if (item.link) {
+              const promise = this.getFile(item.link).then(data => {
+                // *下载文件, 并存成ArrayBuffer对象
+                const arr_name = item.name.split("/");
+                const file_name = arr_name[arr_name.length - 1]; // *获取文件名
+                zip.file(file_name, data, { binary: true }); // *逐个添加文件
+                cache[file_name] = data;
+              });
+              promises.push(promise);
+            }
+          });
+          Promise.all(promises).then(() => {
+            zip.generateAsync({
+              type: "blob", compression: 'DEFLATE',  // *STORE: 默认不压缩; DEFLATE：需要压缩
+              compressionOptions: {
+                level: 9 // *压缩等级 1~9。1: 压缩速度最快，9: 最优压缩方式
+              }
+            }).then(content => {
+              saveAs(content, blogTitle); // *生成二进制流，利用file-saver保存文件，文件名自定义
+            });
+          });
+        } else if (data.length == 1) {
+          fetch(data[0].link, {
+            method: 'get',
+            heanders: {
+              'Content-Type': 'application/json;charset=UTF-8'
+            }
+          })
+            .then(res => res.blob())
+            .then(blob => {
+              const link = document.createElement('a')
+              link.style.display = 'none'
+              link.download = data[0].name// 设置下载属性 以及文件名
+              link.href = URL.createObjectURL(blob)
 
-							document.body.appendChild(link)
-							link.click()
-							// 释放的 URL 对象以及移除 a 标签
-							URL.revokeObjectURL(link.href)
-							document.body.removeChild(link)
-						})
-				}else{
-					this.$message.error('该巡检内容没有维护合同附件')
-				}
-			})
-		},
-		/**
+              document.body.appendChild(link)
+              link.click()
+              // 释放的 URL 对象以及移除 a 标签
+              URL.revokeObjectURL(link.href)
+              document.body.removeChild(link)
+            })
+        } else {
+          this.$message.error('该巡检内容没有维护合同附件')
+        }
+      })
+    },
+    /**
  * 方法一
  *  table合并行通用 */
-		mergeTableRow(data, merge) {
-			if (!merge || merge.length === 0) {
-				return data
-			}
-			merge.forEach((m) => {
-				const mList = {}
-				data = data && data.map((v, index) => {
-					const rowVal = v[m]
-					if (mList[rowVal] && mList[rowVal].newIndex === index) {
-						mList[rowVal]['num']++
-						mList[rowVal]['newIndex']++
-						data[mList[rowVal]['index']][m + '-span'].rowspan++
-						v[m + '-span'] = {
-							rowspan: 0,
-							colspan: 0
-						}
-					} else {
-						mList[rowVal] = { num: 1, index: index, newIndex: index + 1 }
-						v[m + '-span'] = {
-							rowspan: 1,
-							colspan: 1
-						}
-					}
-					return v
-				})
-			})
-			return data
-		},
+    mergeTableRow(data, merge) {
+      if (!merge || merge.length === 0) {
+        return data
+      }
+      merge.forEach((m) => {
+        const mList = {}
+        data = data && data.map((v, index) => {
+          const rowVal = v[m]
+          if (mList[rowVal] && mList[rowVal].newIndex === index) {
+            mList[rowVal]['num']++
+            mList[rowVal]['newIndex']++
+            data[mList[rowVal]['index']][m + '-span'].rowspan++
+            v[m + '-span'] = {
+              rowspan: 0,
+              colspan: 0
+            }
+          } else {
+            mList[rowVal] = { num: 1, index: index, newIndex: index + 1 }
+            v[m + '-span'] = {
+              rowspan: 1,
+              colspan: 1
+            }
+          }
+          return v
+        })
+      })
+      return data
+    },
 
     handleAdd() {
       this.dialogTitle = '新建'
@@ -508,34 +509,34 @@ export default {
         })
       }
 
-		},
-		onLoad(page, params = {}) {
-			let query = {
-				deptName: this.search.deptName ? this.search.deptName : null,			//单位名称
-				current: this.page.currentPage,		//页数
-				size: this.page.pageSize		//条数
-			}
-			this.loading = true
-			getContentList(query).then(res => {
-				this.data = res.data.data.records
-				this.page.total = res.data.data.total
-				this.loading = false
-			})
-		},
-	}
+    },
+    onLoad(page, params = {}) {
+      let query = {
+        deptName: this.search.deptName ? this.search.deptName : null,			//单位名称
+        current: this.page.currentPage,		//页数
+        size: this.page.pageSize		//条数
+      }
+      this.loading = true
+      getContentList(query).then(res => {
+        this.data = res.data.data.records
+        this.page.total = res.data.data.total
+        this.loading = false
+      })
+    },
+  }
 };
 </script>
 
 <style>
 .box {
-	height: 800px;
+  height: 800px;
 }
 
 .el-scrollbar {
-	height: 100%;
+  height: 100%;
 }
 
 .box .el-scrollbar__wrap {
-	overflow: scroll;
+  overflow: scroll;
 }
 </style>
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 96f425e..1030a7d 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -260,6 +260,7 @@ export default {
         });
         // 数据回调进行刷新
         done(row);
+        this.onLoad();
       }, error => {
         window.console.log(error);
         loading();
@@ -273,8 +274,10 @@ export default {
         });
         // 数据回调进行刷新
         done(row);
+        this.onLoad();
       }, error => {
         window.console.log(error);
+
         loading();
       });
     },
@@ -387,6 +390,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
+      this.data = []
       getLazyList(this.parentId, Object.assign(params, this.query)).then(res => {
         this.data = res.data.data;
         this.loading = false;
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 012c101..7cd4025 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -232,7 +232,7 @@ export default {
         dialogType: 'drawer',
         dialogClickModal: false,
         searchShowBtn: false,   // 栏目折叠显隐
-        refreshBtn: false,      // 刷新 
+        refreshBtn: false,      // 刷新
         columnBtn: false,       // 操作列显隐
         gridBtn:false,
         excelBtn: false,       // 导出Excel
@@ -728,14 +728,14 @@ export default {
       row.deptId = func.join(row.deptId);
       row.roleId = func.join(row.roleId);
       row.postId = func.join(row.postId);
-      if (row.deptId.split(',').length > 1) {
-        this.$message({
-          type: "error",
-          message: "所属部门只能选择一个！"
-        });
-        loading();
-        return false
-      }
+      // if (row.deptId.split(',').length > 1) {
+      //   this.$message({
+      //     type: "error",
+      //     message: "所属部门只能选择一个！"
+      //   });
+      //   loading();
+      //   return false
+      // }
       add(row).then(() => {
         this.initFlag = false;
         this.onLoad(this.page);
@@ -753,14 +753,14 @@ export default {
       row.deptId = func.join(row.deptId);
       row.roleId = func.join(row.roleId);
       row.postId = func.join(row.postId);
-      if (row.deptId.split(',').length > 1) {
-        this.$message({
-          type: "error",
-          message: "所属部门只能选择一个！"
-        });
-        loading();
-        return false
-      }
+      // if (row.deptId.split(',').length > 1) {
+      //   this.$message({
+      //     type: "error",
+      //     message: "所属部门只能选择一个！"
+      //   });
+      //   loading();
+      //   return false
+      // }
       update(row).then(() => {
         this.initFlag = false;
         this.onLoad(this.page);
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index 345d899..fc8bb88 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -893,7 +893,7 @@ export default {
           {
             name: '维修数量',
             type: 'bar',
-            barWidth: this.numData == 1 ? 50 : null,
+            barWidth: this.numData == 1 ? 30 : 30,
             data: this.peopleNum,
             itemStyle: {
               color: '#2478f2'
diff --git a/vue.config.js b/vue.config.js
index c759086..4b794d1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -28,8 +28,8 @@ module.exports = {
         //本地服务接口地址
         // target: 'http://localhost',
         // target:'http://192.168.0.111:80',
-        // target:'http://192.168.1.12:10001',
-        target:'http://192.168.1.4:10001',
+        target:'http://192.168.1.12:10001',
+        // target:'http://192.168.1.4:10001',
         // target:'http://192.168.0.116:80',
         // target:'http://192.168.0.108:80',
         //远程演示服务地址,可用于直接启动项目