diff --git a/src/views/businessManagement/ordinary.vue b/src/views/businessManagement/ordinary.vue
index 65bef5a..a01eb09 100644
--- a/src/views/businessManagement/ordinary.vue
+++ b/src/views/businessManagement/ordinary.vue
@@ -10,6 +10,11 @@
           range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
       </template>
+      <template slot-scope="{row}" slot="overStatusSearch">
+        <el-select placeholder="请选择完成状态" v-model="searchForm.overStatus">
+          <el-option v-for="item in overStatusList" :key="item.value" :label="item.name" :value="item.value"></el-option>
+        </el-select>
+      </template>
       <template slot="fillingTimeSearch">
         <el-date-picker v-model="form.fillingTimeRange" type="daterange" range-separator="至" start-placeholder="提报开始日期"
           end-placeholder="提报结束日期">
@@ -775,6 +780,14 @@ export default {
             search: true,
             overHidden: true,
           },
+          {
+            label: "完成状态",
+            labelWidth: 120,
+            prop: "overStatus",
+            search: true,
+            overHidden: true,
+            hide:true
+          },
           {
             label: "设备名称",
             labelWidth: 120,
@@ -835,7 +848,8 @@ export default {
           {
             label:'维修人员',
             prop:"repairPersonName",
-            hide:false
+            hide:false,
+            search:true
           },
           {
             label: "审批时间",
@@ -897,8 +911,8 @@ export default {
       headers: {
 
       },
+      overStatusList:[],
       completeImgList: [],//维修完成上传图片
-
     }
   },
 
@@ -940,6 +954,61 @@ export default {
 
     this.role_id = this.userInfo.role_id
     this.dataTypes = this.userInfo.dataType
+    // dataTypes    1:实验室  2:客服 3:维修负责人 4：维修人员 
+    if(this.dataTypes == 2){
+      this.overStatusList = [
+        {
+          value:'101,400,205',
+          name:'待派单'
+        },
+        {
+          value:'201,401,402,301',
+          name:'待维修'
+        },
+        {
+          value:'403,202,405,105,406',
+          name:'维修完成'
+        },
+        {
+          value:'203,204',
+          name:'已完成'
+        }
+      ]
+    }else if(this.dataTypes == 3){
+      this.overStatusList = [
+        {
+          value:'201',
+          name:'待确认'
+        },
+        {
+          value:'103,404,401',
+          name:'维修中'
+        },
+        {
+          value:'403,202,405,105,406',
+          name:'维修完成'
+        },
+        {
+          value:'203,204',
+          name:'已完成'
+        }
+      ]
+    }else if(this.dataTypes == 4){
+      this.overStatusList = [
+        {
+          value:'201',
+          name:'待确认'
+        },
+        {
+          value:'401,105',
+          name:'待提交'
+        },
+        {
+          value:'403,104,202,203,204,400',
+          name:'已完成'
+        }
+      ]
+    }
     // 获取维修人员列表
     getRepairPeople().then(res => {
       this.repairPersonList = res.data.data
@@ -959,6 +1028,7 @@ export default {
       }
       if(this.role_id == '1839552581620793346'){
         this.option.column.find(item => item.prop == 'repairPersonName').hide = true
+        this.option.column.find(item => item.prop == 'repairPersonName').search = false
       }
     } else if (this.role_id == '1839600115013713921') {
       this.option.column.find(item => item.prop == 'finishTime').hide = true
@@ -2000,7 +2070,9 @@ export default {
         endTime: this.searchForm.timeRange && this.searchForm.timeRange.length != 0 ? this.searchForm.timeRange[1].toString() + ' 23:59:59' : '',		             //结束时间
         faultType: this.searchForm.faultType ? this.searchForm.faultType : '',				      //故障类型
         reportUnitName: this.searchForm.reportUnitName ? this.searchForm.reportUnitName : '',
-        dataType: this.role_id == '1123598816738675201' ? '' : this.dataTypes
+        dataType: this.role_id == '1123598816738675201' ? '' : this.dataTypes,
+        statusSearch:this.searchForm.overStatus ? this.searchForm.overStatus : '',
+        repairPersonName:this.searchForm.repairPersonName ? this.searchForm.repairPersonName : ''
       }
       getList(query).then(res => {
         let data_ = res.data.data.records
diff --git a/src/views/goodsManagement/reciviceList.vue b/src/views/goodsManagement/reciviceList.vue
index d5d79fd..353bd6b 100644
--- a/src/views/goodsManagement/reciviceList.vue
+++ b/src/views/goodsManagement/reciviceList.vue
@@ -17,8 +17,8 @@
         </el-table>
       </template>
       <template slot-scope="{ row }" slot="isReturn">
-        <el-tag v-show="row.status == '3'" :type="row.isReturn == 1 ? 'warning' : 'success'">
-          {{ row.isReturn == 1 ? '待归还' : row.isReturn == 2 ? '已归还' : '' }}
+        <el-tag  :type="row.isReturn == 0 ? 'warning' : 'success'">
+          {{ row.isReturn == 0 ? '否' : row.isReturn == 1 ? '是' : '' }}
         </el-tag>
       </template>
       <template slot-scope="{ row }" slot="status">
@@ -248,16 +248,15 @@ export default {
             overHidden: true,
           },
           {
-            label: "是否归还",
-            labelWidth: 120,
+            label: "是否需要归还",
+            labelWidth: 150,
             type: "select",
             search: true,
             dicData: [
-              { value: '0', label: '待归还' },
-              { value: '1', label: '已归还' },
+              { value: '1', label: '是' },
+              { value: '0', label: '否' },
             ],
             prop: "isReturn",
-            labelWidth: 120,
             overHidden: true,
             slot: true,
           },
@@ -466,9 +465,11 @@ export default {
           if (this.viewType == 'import') {
             if (this.receiveForm.tableData.find(item => item.outNum == 0)) {
               this.$message.error('出库数量不可为0')
-            }else if (this.receiveForm.tableData.find(item => item.returnTime == '')) {
-              this.$message.error('请填写预计归还日期')
-            }else {
+            }
+            // else if (this.receiveForm.tableData.find(item => item.returnTime == '')) {
+            //   this.$message.error('请填写预计归还日期')
+            // }
+            else {
               // console.log('this.receiveForm.tableData', this.receiveForm.tableData)
               let data = []
               this.receiveForm.tableData.map(item => {
@@ -476,14 +477,16 @@ export default {
                   id: item.id,
                   productId: item.productId,
                   outNum: item.outNum,
-                  applyNum: item.applyNum
+                  applyNum: item.applyNum,
+                  returnTime:item.returnTime != '' ?  item.returnTime + ' 00:00:00' : ''
                 })
               })
               let query = {
                 details: data,
                 id: this.receiveForm.id,
-                isReturn: this.receiveForm.isReturn			//是否需要归还
+                isReturn: data.find(item => item.returnTime != '') ? 1 : 0			//是否需要归还
               }
+              console.log('query===========>',query)
               reciveGoods(query).then(res => {
                 if (res.data.code == 200) {
                   this.$message.success('出库成功')
diff --git a/src/views/knowledge/list.vue b/src/views/knowledge/list.vue
index 64ff4a0..743afe6 100644
--- a/src/views/knowledge/list.vue
+++ b/src/views/knowledge/list.vue
@@ -15,7 +15,8 @@
       </template>
       <template slot-scope="{row}" slot="imgUrlForm">
         <el-upload class="upload-demo" action="/api/blade-resource/oss/endpoint/put-file" :on-remove="handleRemove"
-          :on-success="handleSuccess" multiple :limit="3" :on-exceed="handleExceed" :file-list="imgList">
+          :on-success="handleSuccess" multiple :limit="3" :on-exceed="handleExceed" :file-list="imgList"
+          :headers="headers">
           <el-button size="small" type="primary">点击上传</el-button>
           <div slot="tip" class="el-upload__tip">最多只能上传3个文件</div>
         </el-upload>
@@ -42,7 +43,9 @@
 </template>
 <script>
 // import { getKnowledgeList, remove, add, getDetail, doPublish, addPublish, queryArticleDetail } from "@/api/articlelist/article";
+import website from '@/config/website';
 import { getKnowledgeList, addKnowledge, getDetail, editKnowledge, insertKnowledgeContent, updateKnowledge, deleteKnowledge } from '@/api/knowledge/knowledge'
+import {getToken, removeToken, removeRefreshToken} from '@/util/auth';
 import { mapGetters } from "vuex";
 import JSZip from 'jszip';
 import { saveAs } from 'file-saver';
@@ -155,7 +158,8 @@ export default {
       data: [],
       fileList: [],
       imgList: [],
-      previewList: []
+      previewList: [],
+      headers:{},
     };
   },
   computed: {
@@ -169,6 +173,11 @@ export default {
     }
   },
   mounted() {
+    this.headers = {
+      "Authorization":`Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`,
+      'Blade-Auth':'bearer ' + getToken(),
+      'Blade-Requested-With':'BladeHttpRequest'
+    }
     console.log('permission----------->',this.permission.knowledgeView)
     this.option.addBtn = this.permission.knowledgeAdd ? true :false
     console.log('optipon===============>',this.option)