diff --git a/maintain-ui/src/views/business/repairFormRecord/index.vue b/maintain-ui/src/views/business/repairFormRecord/index.vue
index a4788aeb463b75af146712133e8b0e1b77098ae1..fac7ed7ba3131adbaddbb74626c5a1b1211bc8d5 100644
--- a/maintain-ui/src/views/business/repairFormRecord/index.vue
+++ b/maintain-ui/src/views/business/repairFormRecord/index.vue
@@ -1,24 +1,63 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="报修单号" prop="repairNumber">
-        <el-input
-          v-model="queryParams.repairNumber"
-          placeholder="请输入报修单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="state">
-        <el-select v-model="queryParams.state" clearable placeholder="请选择">
-          <el-option v-for="item in dict.type.repair_form_state" :key="item.value" :value="item.value" :label="item.label" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
+        <el-form-item label="报修单号" prop="repairNumber">
+          <el-input
+            v-model="queryParams.repairNumber"
+            placeholder="请输入报修单号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="车牌号" prop="plateNumber">
+          <el-input
+            v-model="queryParams.plateNumber"
+            placeholder="请输入车牌号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="状态" prop="state">
+          <el-select v-model="queryParams.state" clearable placeholder="请选择">
+            <el-option v-for="item in dict.type.repair_form_state" :key="item.value" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="客户名称" prop="clientName">
+          <el-input
+            v-model="queryParams.clientName"
+            placeholder="请输入客户名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="phone">
+          <el-input
+            v-model="queryParams.phone"
+            placeholder="请输入联系方式"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="客户类型" prop="clientType">
+          <el-select v-model="queryParams.clientType" placeholder="请选择">
+            <el-option v-for="item in dict.type.client_type" :key="item.value" :value="item.value" :label="item.label"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="登记时间" prop="dengjishijian">
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss"
+                          v-model="queryParams.dengjishijian"
+                          type="datetimerange"
+                          :default-time="['00:00:00', '23:59:59']"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -79,6 +118,14 @@
             icon="el-icon-s-operation"
             @click="handleDetail(scope.row)"
           >详情</el-button>
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['business:repairForm:abolish']"
+              v-show="scope.row.isDelivery==0&&scope.row.state!=3"
+            >作废</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -100,7 +147,7 @@
 </template>
 
 <script>
-import { listRepairForm, getRepairForm, delRepairForm, addRepairForm, updateRepairForm } from "@/api/business/repairForm";
+import { listRepairForm, getRepairForm, delRepairForm, addRepairForm, updateRepairForm,abolishRepairForm} from "@/api/business/repairForm";
 import Detail from '@/views/business/repairForm/detail.vue'
 
 export default {
@@ -135,7 +182,11 @@ export default {
         pageNum: 1,
         pageSize: 10,
         repairNumber: undefined,
+        plateNumber: undefined,
         state: undefined,
+        clientName: undefined,
+        phone: undefined,
+        clientType: undefined,
       },
       // 表单参数
       form: {},
@@ -351,21 +402,23 @@ export default {
         }
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
+    /** 作废按钮操作 */
+      handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除报修单编号为"' + ids + '"的数据项？').then(() => {
+      this.$modal.confirm('是否确认作废报修单号为"' + row.repairNumber + '"的数据项？报修单作废后已出库物料库存将会返回').then(() => {
         this.loading = true;
-        return delRepairForm(ids);
+        return abolishRepairForm(ids);
       }).then(() => {
         this.loading = false;
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("作废成功");
       }).catch(() => {
       }).finally(() => {
         this.loading = false;
       });
     },
+
+
     /** 导出按钮操作 */
     handleExport() {
       this.download('business/repairForm/export', {
diff --git a/maintain-ui/src/views/system/user/index.vue b/maintain-ui/src/views/system/user/index.vue
index 4e01e2b14c9e79bba4bf9d2273840670a0e86c57..280689ee10ddaa171dddf0e900bb179323eab664 100644
--- a/maintain-ui/src/views/system/user/index.vue
+++ b/maintain-ui/src/views/system/user/index.vue
@@ -39,6 +39,18 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="用户呢称" prop="nickName">
+            <el-input
+              v-model="queryParams.nickName"
+              placeholder="请输入用户呢称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+         <el-form-item label="归属部门" prop="deptId" >
+              <treeselect v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" style="width:240px" />
+            </el-form-item>
           <el-form-item label="手机号码" prop="phonenumber">
             <el-input
               v-model="queryParams.phonenumber"
@@ -431,6 +443,7 @@ export default {
         pageSize: 10,
         userName: undefined,
         phonenumber: undefined,
+        nickName:undefined,
         status: undefined,
         deptId: undefined
       },