ysy пре 1 година
родитељ
комит
1c6d6f568a
67 измењених фајлова са 388 додато и 263 уклоњено
  1. 3 3
      src/components/material/user-search.vue
  2. 3 3
      src/components/select/bom/product-search.vue
  3. 2 2
      src/components/select/organization/components/org-user-search.vue
  4. 2 2
      src/views/bpm/processClass/components/search.vue
  5. 3 3
      src/views/codeManagement/components/code-search.vue
  6. 5 5
      src/views/documentManagement/certificateManagement/components/certificate-search.vue
  7. 4 4
      src/views/documentManagement/docManagement/components/doc-search.vue
  8. 1 1
      src/views/extension/table-select/components/demo-advanced-search.vue
  9. 5 5
      src/views/factoryModel/factoryManagement/components/search.vue
  10. 4 4
      src/views/factoryModel/jobManagement/components/user-search.vue
  11. 4 4
      src/views/factoryModel/plant/components/search.vue
  12. 4 4
      src/views/factoryModel/productionLine/components/search.vue
  13. 3 3
      src/views/factoryModel/qualificationManagement/components/user-search.vue
  14. 5 5
      src/views/factoryModel/station/components/search.vue
  15. 6 6
      src/views/factoryModel/workshop/components/search.vue
  16. 2 2
      src/views/list/advanced/index.vue
  17. 5 5
      src/views/list/basic/components/search-form.vue
  18. 7 7
      src/views/material/BOMmanage/components/document.vue
  19. 4 4
      src/views/material/BOMmanage/components/routingDialog.vue
  20. 2 2
      src/views/material/BOMmanage/components/step-search.vue
  21. 3 3
      src/views/material/BOMmanage/components/user-search.vue
  22. 5 5
      src/views/material/BOMmanage/components/workmanship.vue
  23. 6 6
      src/views/material/materialBOM/components/BOM-search.vue
  24. 4 4
      src/views/material/product/components/index-search.vue
  25. 9 9
      src/views/material/product/components/link-material-dialog.vue
  26. 6 6
      src/views/ruleConfiguration/inspectionPoint/components/patrol-search.vue
  27. 6 6
      src/views/ruleConfiguration/maintenance/components/maintain-search.vue
  28. 4 4
      src/views/rulesManagement/components/product-search.vue
  29. 6 6
      src/views/rulesManagement/earlyWarningRules/components/matter-search.vue
  30. 3 3
      src/views/rulesManagement/earlyWarningRules/components/product-search.vue
  31. 7 7
      src/views/rulesManagement/inspectionPoint/components/patrol-search.vue
  32. 7 7
      src/views/rulesManagement/maintenance/components/maintain-search.vue
  33. 6 6
      src/views/rulesManagement/matterRules/components/matter-search.vue
  34. 3 3
      src/views/rulesManagement/matterRules/components/product-search.vue
  35. 7 7
      src/views/rulesManagement/measuringSubmit/components/patrol-search.vue
  36. 7 7
      src/views/rulesManagement/planRules/components/inventory-search.vue
  37. 3 3
      src/views/system/dictionary/components/dict-data-search.vue
  38. 3 3
      src/views/system/file/components/file-search.vue
  39. 2 2
      src/views/system/login-record/components/login-record-search.vue
  40. 3 3
      src/views/system/menu/components/menu-search.vue
  41. 2 2
      src/views/system/operation-record/components/operation-record-search.vue
  42. 3 3
      src/views/system/organization/components/org-user-search.vue
  43. 3 3
      src/views/system/role/components/role-search.vue
  44. 3 3
      src/views/system/user/components/user-search.vue
  45. 3 3
      src/views/technology/control/components/user-search.vue
  46. 5 5
      src/views/technology/parameter/components/user-search.vue
  47. 3 3
      src/views/technology/productParam/components/product-search.vue
  48. 3 3
      src/views/technology/productParam/components/user-search.vue
  49. 4 4
      src/views/technology/production/components/parameter/components/user-search.vue
  50. 4 4
      src/views/technology/production/components/user-search.vue
  51. 2 2
      src/views/technology/production/components/workCenter-search.vue
  52. 4 4
      src/views/technology/route/components/product-search.vue
  53. 4 4
      src/views/technology/route/components/production/components/parameter/components/user-search.vue
  54. 3 3
      src/views/technology/route/components/production/components/user-search.vue
  55. 5 5
      src/views/technology/route/components/user-search.vue
  56. 4 4
      src/views/technology/stepManagement/components/parameter/components/user-search.vue
  57. 4 4
      src/views/technology/stepManagement/components/user-search.vue
  58. 3 3
      src/views/technology/stepManagement/components/workCenter-search.vue
  59. 4 4
      src/views/technology/version/components/BOM-search.vue
  60. 3 3
      src/views/technology/version/components/route-search.vue
  61. 5 5
      src/views/technology/version/components/user-search.vue
  62. 5 5
      src/views/technology/work/components/user-search.vue
  63. 4 4
      src/views/versionManage/components/index-search.vue
  64. 3 3
      src/views/workforceManagement/schedule/components/use-search.vue
  65. 36 3
      src/views/workforceManagement/team/components/edit.vue
  66. 77 0
      src/views/workforceManagement/team/components/search.vue
  67. 15 0
      src/views/workforceManagement/team/index.vue

+ 3 - 3
src/components/material/user-search.vue

@@ -13,7 +13,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.code"
+            v-model.trim="where.code"
             placeholder="请输入"
           />
         </el-form-item>
@@ -23,7 +23,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.name"
+            v-model.trim="where.name"
             placeholder="请输入"
           />
         </el-form-item>
@@ -34,7 +34,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.modelType"
+            v-model.trim="where.modelType"
             placeholder="请输入"
           />
         </el-form-item>

+ 3 - 3
src/components/select/bom/product-search.vue

@@ -9,18 +9,18 @@
     <el-row :gutter="10">
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="编码">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="名称">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="型号">
-          <el-input clearable v-model="where.modelType" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.modelType" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 4 } : { md: 4 }">

+ 2 - 2
src/components/select/organization/components/org-user-search.vue

@@ -12,7 +12,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.loginName"
+            v-model.trim="where.loginName"
             placeholder="请输入用户账号"
           />
         </el-form-item>
@@ -22,7 +22,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.name"
+            v-model.trim="where.name"
             placeholder="请输入姓名"
           />
         </el-form-item>

+ 2 - 2
src/views/bpm/processClass/components/search.vue

@@ -10,12 +10,12 @@
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
 
         <el-form-item label="名称:">
-          <el-input v-model="where.name"></el-input>
+          <el-input v-model.trim="where.name"></el-input>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }" >

+ 3 - 3
src/views/codeManagement/components/code-search.vue

@@ -12,7 +12,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.code"
+            v-model.trim="where.code"
             placeholder="请输入编码"
           />
         </el-form-item>
@@ -22,7 +22,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.name"
+            v-model.trim="where.name"
             placeholder="请输入名称"
           />
         </el-form-item>
@@ -32,7 +32,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.remark"
+            v-model.trim="where.remark"
             placeholder="请输入描述"
           />
         </el-form-item>

+ 5 - 5
src/views/documentManagement/certificateManagement/components/certificate-search.vue

@@ -15,7 +15,7 @@
             class="ele-fluid"
             end-placeholder="结束日期"
             start-placeholder="开始日期"
-            v-model="where.time"
+            v-model.trim="where.time"
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             :default-time="['00:00:00', '23:59:59']"
@@ -25,12 +25,12 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="证件编号">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6}">
         <el-form-item label="持证人">
-          <el-input clearable v-model="where.holder" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.holder" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 5 } : { span: 5 }">
@@ -38,14 +38,14 @@
           <DictSelection
             dictName="证件类型"
             clearable
-            v-model="where.type"
+            v-model.trim="where.type"
           >
           </DictSelection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">

+ 4 - 4
src/views/documentManagement/docManagement/components/doc-search.vue

@@ -9,12 +9,12 @@
     <el-row :gutter="10">
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="文档名称">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="模块名">
-          <el-input clearable v-model="where.module" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.module" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
@@ -24,7 +24,7 @@
             class="ele-fluid"
             end-placeholder="结束日期"
             start-placeholder="开始日期"
-            v-model="where.time"
+            v-model.trim="where.time"
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             :default-time="['00:00:00', '23:59:59']"
@@ -34,7 +34,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 6 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
 

+ 1 - 1
src/views/extension/table-select/components/demo-advanced-search.vue

@@ -3,7 +3,7 @@
     <el-input
       clearable
       size="small"
-      v-model="where.keywords"
+      v-model.trim="where.keywords"
       placeholder="输入关键字搜索"
       prefix-icon="el-icon-search"
       @change="search"

+ 5 - 5
src/views/factoryModel/factoryManagement/components/search.vue

@@ -9,11 +9,11 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="工厂编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入"/>
+          <el-input clearable v-model.trim="where.code" placeholder="请输入"/>
         </el-form-item>
         <el-form-item label="所属区域:" prop="location_city">
           <area-select
-            v-model="where.areaId"
+            v-model.trim="where.areaId"
             :data="areaTreeList"
             ref="tree"
           />
@@ -21,14 +21,14 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="工厂名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入"/>
+          <el-input clearable v-model.trim="where.name" placeholder="请输入"/>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="状态:">
           <el-select
             style="width: 100%;"
-            v-model="where.enable"
+            v-model.trim="where.enable"
             class="m-2"
             placeholder="请选择"
             size="large"
@@ -44,7 +44,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
 

+ 4 - 4
src/views/factoryModel/jobManagement/components/user-search.vue

@@ -9,7 +9,7 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="类型:" prop="type">
-          <el-select clearable v-model="where.type" style="width: 100%">
+          <el-select clearable v-model.trim="where.type" style="width: 100%">
             <el-option
               v-for="item in typeList"
               :key="item.dictCode"
@@ -22,17 +22,17 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">

+ 4 - 4
src/views/factoryModel/plant/components/search.vue

@@ -9,24 +9,24 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="厂房编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
 
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="厂房名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="所属区域:">
           <area-select
-            v-model="where.areaId"
+            v-model.trim="where.areaId"
             :data="areaTreeList"
             ref="tree"
           />

+ 4 - 4
src/views/factoryModel/productionLine/components/search.vue

@@ -9,18 +9,18 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="产线编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="产线名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="所属区域:" prop="location_city">
           <area-select
-            v-model="where.areaId"
+            v-model.trim="where.areaId"
             :data="areaTreeList"
             ref="tree"
           />
@@ -28,7 +28,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">

+ 3 - 3
src/views/factoryModel/qualificationManagement/components/user-search.vue

@@ -9,17 +9,17 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">

+ 5 - 5
src/views/factoryModel/station/components/search.vue

@@ -9,11 +9,11 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="工位编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="所属区域:">
           <area-select
-            v-model="where.areaId"
+            v-model.trim="where.areaId"
             :data="areaTreeList"
             ref="tree"
           />
@@ -21,13 +21,13 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="工位名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="负责人:">
           <el-select
-            v-model="where.leaderId"
+            v-model.trim="where.leaderId"
             filterable
             placeholder="请选择"
             style="width: 100%"
@@ -44,7 +44,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">

+ 6 - 6
src/views/factoryModel/workshop/components/search.vue

@@ -9,11 +9,11 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="车间编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="所属区域:">
           <area-select
-            v-model="where.areaId"
+            v-model.trim="where.areaId"
             :data="areaTreeList"
             ref="tree"
           />
@@ -21,7 +21,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="车间名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
 
 
@@ -31,7 +31,7 @@
           <ele-tree-select
             clearable
             :data="options.groupId"
-            v-model="where.groupId"
+            v-model.trim="where.groupId"
             valueKey="id"
             labelKey="name"
             placeholder="请选择"
@@ -42,7 +42,7 @@
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="所属工厂:">
           <el-select
-            v-model="where.parentId"
+            v-model.trim="where.parentId"
             placeholder="请选择"
             style="width: 100%"
             clearable
@@ -59,7 +59,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">

+ 2 - 2
src/views/list/advanced/index.vue

@@ -28,7 +28,7 @@
         <h6 class="ele-table-tool-title">复杂列表</h6>
         <div class="ele-tool ele-space">
           <div class="ele-action">
-            <el-radio-group v-model="where.state" size="small" @change="query">
+            <el-radio-group v-model.trim="where.state" size="small" @change="query">
               <el-radio-button :label="0">全部</el-radio-button>
               <el-radio-button :label="1">进行中</el-radio-button>
               <el-radio-button :label="2">已完成</el-radio-button>
@@ -45,7 +45,7 @@
               clearable
               size="small"
               placeholder="请输入..."
-              v-model="where.keyword"
+              v-model.trim="where.keyword"
               @keyup.enter.native="query"
             >
               <template v-slot:append>

+ 5 - 5
src/views/list/basic/components/search-form.vue

@@ -10,13 +10,13 @@
       <el-row :gutter="15">
         <el-col v-bind="styleResponsive ? { lg: 8, md: 12 } : { span: 8 }">
           <el-form-item label="用户账号:">
-            <el-input v-model="where.username" placeholder="请输入" clearable />
+            <el-input v-model.trim="where.username" placeholder="请输入" clearable />
           </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { lg: 8, md: 12 } : { span: 8 }">
           <el-form-item label="性别:">
             <el-select
-              v-model="where.sex"
+              v-model.trim="where.sex"
               placeholder="请选择"
               clearable
               class="ele-fluid"
@@ -31,7 +31,7 @@
           v-bind="styleResponsive ? { lg: 8, md: 12 } : { span: 8 }"
         >
           <el-form-item label="用户名:">
-            <el-input v-model="where.nickname" placeholder="请输入" clearable />
+            <el-input v-model.trim="where.nickname" placeholder="请输入" clearable />
           </el-form-item>
         </el-col>
         <el-col
@@ -39,7 +39,7 @@
           v-bind="styleResponsive ? { lg: 8, md: 12 } : { span: 8 }"
         >
           <el-form-item label="手机号:">
-            <el-input v-model="where.phone" placeholder="请输入" clearable />
+            <el-input v-model.trim="where.phone" placeholder="请输入" clearable />
           </el-form-item>
         </el-col>
         <el-col
@@ -48,7 +48,7 @@
         >
           <el-form-item label="状态:">
             <el-select
-              v-model="where.status"
+              v-model.trim="where.status"
               placeholder="请选择"
               clearable
               class="ele-fluid"

+ 7 - 7
src/views/material/BOMmanage/components/document.vue

@@ -9,41 +9,41 @@
       <el-row type="flex" :gutter="15">
         <el-col :span="6">
           <el-form-item label="类型:" label-width="100px">
-            <el-input clearable v-model="where.code" placeholder="请输入" />
+            <el-input clearable v-model.trim="where.code" placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="编码:" label-width="100px">
-            <el-input clearable v-model="where.name" placeholder="请输入" />
+            <el-input clearable v-model.trim="where.name" placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="名称:" label-width="100px">
-            <el-input clearable v-model="where.fixCode" placeholder="请输入" />
+            <el-input clearable v-model.trim="where.fixCode" placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="版本:" label-width="100px">
-            <el-input clearable v-model="where.name" placeholder="请输入" />
+            <el-input clearable v-model.trim="where.name" placeholder="请输入" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row type="flex" :gutter="15">
         <el-col :span="6">
           <el-form-item label="状态" label-width="100px">
-            <el-input clearable v-model="where.name" placeholder="请输入" />
+            <el-input clearable v-model.trim="where.name" placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="创建人" label-width="100px">
-            <el-input clearable v-model="where.name" placeholder="请输入" />
+            <el-input clearable v-model.trim="where.name" placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="创建时间" label-width="100px">
             <el-date-picker
               style="width: 100%"
-              v-model="where.endTime"
+              v-model.trim="where.endTime"
               value-format="yyyy-MM"
               type="month"
               placeholder="选择有效期结束时间"

+ 4 - 4
src/views/material/BOMmanage/components/routingDialog.vue

@@ -21,18 +21,18 @@
           <el-row>
             <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
               <el-form-item label="工艺路线组编码:">
-                <el-input clearable v-model="where.code" placeholder="请输入" />
+                <el-input clearable v-model.trim="where.code" placeholder="请输入" />
               </el-form-item>
             </el-col>
             <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
               <el-form-item label="工艺路线名称:">
-                <el-input clearable v-model="where.name" placeholder="请输入" />
+                <el-input clearable v-model.trim="where.name" placeholder="请输入" />
               </el-form-item>
             </el-col>
             <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
               <el-form-item label="生产版本:">
                 <el-select
-                  v-model="where.produceVersionId"
+                  v-model.trim="where.produceVersionId"
                   filterable
                   placeholder="请选择"
                   :style="{ width: '100%' }"
@@ -50,7 +50,7 @@
             <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
               <el-form-item label="状态:" label-width="70px">
                 <el-select
-                  v-model="where.status"
+                  v-model.trim="where.status"
                   filterable
                   placeholder="请选择"
                 >

+ 2 - 2
src/views/material/BOMmanage/components/step-search.vue

@@ -9,12 +9,12 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
 

+ 3 - 3
src/views/material/BOMmanage/components/user-search.vue

@@ -9,18 +9,18 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="控制码:" prop="controlId">
-          <el-select v-model="where.controlId">
+          <el-select v-model.trim="where.controlId">
             <el-option
               v-for="item in controlList"
               :key="item.id"

+ 5 - 5
src/views/material/BOMmanage/components/workmanship.vue

@@ -10,33 +10,33 @@
         <el-row type="flex" :gutter="15">
           <el-col :span="6">
             <el-form-item label="工序编码:" label-width="100px">
-              <el-input clearable v-model="where.code" placeholder="请输入" />
+              <el-input clearable v-model.trim="where.code" placeholder="请输入" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="工序名称:" label-width="100px">
-              <el-input clearable v-model="where.name" placeholder="请输入" />
+              <el-input clearable v-model.trim="where.name" placeholder="请输入" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="版本:" label-width="100px">
               <el-input
                 clearable
-                v-model="where.fixCode"
+                v-model.trim="where.fixCode"
                 placeholder="请输入"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="状态:" label-width="100px">
-              <el-input clearable v-model="where.name" placeholder="请输入" />
+              <el-input clearable v-model.trim="where.name" placeholder="请输入" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" :gutter="15">
           <el-col :span="6">
             <el-form-item label="所属工作中心" label-width="100px">
-              <el-input clearable v-model="where.name" placeholder="请输入" />
+              <el-input clearable v-model.trim="where.name" placeholder="请输入" />
             </el-form-item>
           </el-col>
           <el-col :span="18">

+ 6 - 6
src/views/material/materialBOM/components/BOM-search.vue

@@ -9,19 +9,19 @@
     <el-row :gutter="10">
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="BOM编码">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="BOM名称">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="产品编码">
           <el-input
             clearable
-            v-model="where.categoryCode"
+            v-model.trim="where.categoryCode"
             placeholder="请输入"
           />
         </el-form-item>
@@ -30,7 +30,7 @@
         <el-form-item label="产品名称">
           <el-input
             clearable
-            v-model="where.categoryName"
+            v-model.trim="where.categoryName"
             placeholder="请输入"
           />
         </el-form-item>
@@ -39,7 +39,7 @@
         <el-form-item label="状态">
           <el-select
             clearable
-            v-model="where.status"
+            v-model.trim="where.status"
             placeholder="请选择"
             class="w100"
           >
@@ -54,7 +54,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 12 } : { span: 12 }">

+ 4 - 4
src/views/material/product/components/index-search.vue

@@ -15,7 +15,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.searchKey"
+            v-model.trim="where.searchKey"
             placeholder="型号、牌号"
           />
         </el-form-item>
@@ -28,7 +28,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.code"
+            v-model.trim="where.code"
             placeholder="请输入"
           />
         </el-form-item>
@@ -38,7 +38,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.name"
+            v-model.trim="where.name"
             placeholder="请输入"
           />
         </el-form-item>
@@ -46,7 +46,7 @@
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
 

+ 9 - 9
src/views/material/product/components/link-material-dialog.vue

@@ -28,12 +28,12 @@
                 <categorySelect
                   :pid="type"
                   :key="type"
-                  v-model="where.categoryId"
+                  v-model.trim="where.categoryId"
                 />
                 <!-- <el-input
                   placeholder="请输入"
                   clearable
-                  v-model="where.categoryLevelGroupId"
+                  v-model.trim="where.categoryLevelGroupId"
                 ></el-input> -->
               </el-form-item></el-col
             >
@@ -42,7 +42,7 @@
                 <el-input
                   placeholder="请输入"
                   clearable
-                  v-model="where.code"
+                  v-model.trim="where.code"
                 ></el-input></el-form-item
             ></el-col>
             <el-col :span="12">
@@ -50,7 +50,7 @@
                 <el-input
                   placeholder="请输入"
                   clearable
-                  v-model="where.name"
+                  v-model.trim="where.name"
                 ></el-input></el-form-item
             ></el-col>
             <el-col :span="12">
@@ -58,7 +58,7 @@
                 <el-input
                   placeholder="请输入"
                   clearable
-                  v-model="where.modelType"
+                  v-model.trim="where.modelType"
                 ></el-input></el-form-item
             ></el-col>
           </el-row>
@@ -102,7 +102,7 @@
                 <categorySelect
                   :pid="type"
                   :key="type"
-                  v-model="whereRight.categoryId"
+                  v-model.trim="whereRight.categoryId"
                 /> </el-form-item
             ></el-col>
             <el-col :span="12">
@@ -110,7 +110,7 @@
                 <el-input
                   clearable
                   placeholder="请输入"
-                  v-model="whereRight.code"
+                  v-model.trim="whereRight.code"
                 ></el-input></el-form-item
             ></el-col>
             <el-col :span="12">
@@ -118,7 +118,7 @@
                 <el-input
                   clearable
                   placeholder="请输入"
-                  v-model="whereRight.name"
+                  v-model.trim="whereRight.name"
                 ></el-input></el-form-item
             ></el-col>
             <el-col :span="12">
@@ -126,7 +126,7 @@
                 <el-input
                   clearable
                   placeholder="请输入"
-                  v-model="whereRight.modelType"
+                  v-model.trim="whereRight.modelType"
                 ></el-input></el-form-item
             ></el-col>
           </el-row>

+ 6 - 6
src/views/ruleConfiguration/inspectionPoint/components/patrol-search.vue

@@ -9,24 +9,24 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划配置单号:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="规则名称:">
-          <el-input clearable v-model="where.ruleName" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.ruleName" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划配置名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="状态:">
-          <DictSelection dictName="规则状态" clearable v-model="where.status">
+          <DictSelection dictName="规则状态" clearable v-model.trim="where.status">
           </DictSelection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="巡点检部门:">
-          <deptSelect v-model="where.groupId" />
+          <deptSelect v-model.trim="where.groupId" />
         </el-form-item>
         <el-form-item label="创建时间:">
           <el-date-picker
@@ -43,7 +43,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="设备分类:">
-          <equipmentSelect v-model="where.categoryLevelId" />
+          <equipmentSelect v-model.trim="where.categoryLevelId" />
         </el-form-item>
         <div class="ele-form-actions">
           <el-button

+ 6 - 6
src/views/ruleConfiguration/maintenance/components/maintain-search.vue

@@ -9,24 +9,24 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划配置单号:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="规则名称:">
-          <el-input clearable v-model="where.ruleName" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.ruleName" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划配置名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="状态:">
-          <DictSelection dictName="规则状态" clearable v-model="where.status">
+          <DictSelection dictName="规则状态" clearable v-model.trim="where.status">
           </DictSelection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="执行部门:">
-          <deptSelect v-model="where.groupId" />
+          <deptSelect v-model.trim="where.groupId" />
         </el-form-item>
         <el-form-item label="创建时间:">
           <el-date-picker
@@ -43,7 +43,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="设备分类:">
-          <equipmentSelect v-model="where.categoryLevelId" />
+          <equipmentSelect v-model.trim="where.categoryLevelId" />
         </el-form-item>
         <div class="ele-form-actions">
           <el-button

+ 4 - 4
src/views/rulesManagement/components/product-search.vue

@@ -9,18 +9,18 @@
     <el-row :gutter="10">
       <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
         <el-form-item label="设备名称">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
         <el-form-item label="编号">
-          <el-input clearable v-model="where.codeNumber" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.codeNumber" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
       <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
         <el-form-item label="固资编码">
-          <el-input clearable v-model="where.fixCode" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.fixCode" placeholder="请输入" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -29,7 +29,7 @@
         <el-form-item label="结束时间">
           <el-date-picker
             style="width: 100%"
-            v-model="where.endTime"
+            v-model.trim="where.endTime"
             value-format="yyyy-MM"
             type="month"
             placeholder="选择有效期结束"

+ 6 - 6
src/views/rulesManagement/earlyWarningRules/components/matter-search.vue

@@ -9,16 +9,16 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="规则名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="规则状态:">
-          <DictSelection dictName="规则状态" clearable v-model="where.status">
+          <DictSelection dictName="规则状态" clearable v-model.trim="where.status">
           </DictSelection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="规则编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="创建时间:">
           <el-date-picker
@@ -36,16 +36,16 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="规则类型:">
-          <DictSelection dictName="规则类型" clearable v-model="where.type">
+          <DictSelection dictName="规则类型" clearable v-model.trim="where.type">
           </DictSelection>
         </el-form-item>
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="创建人:">
-          <el-input clearable v-model="where.userName" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.userName" placeholder="请输入" />
         </el-form-item>
         <div class="ele-form-actions">
           <el-button

+ 3 - 3
src/views/rulesManagement/earlyWarningRules/components/product-search.vue

@@ -9,18 +9,18 @@
     <el-row :gutter="10">
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="编码">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="名称">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="型号">
-          <el-input clearable v-model="where.modelType" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.modelType" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 4 } : { md: 4 }">

+ 7 - 7
src/views/rulesManagement/inspectionPoint/components/patrol-search.vue

@@ -9,24 +9,24 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划配置单号:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="规则名称:">
-          <el-input clearable v-model="where.ruleName" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.ruleName" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划配置名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="状态:">
-          <DictSelection dictName="规则状态" clearable v-model="where.status">
+          <DictSelection dictName="规则状态" clearable v-model.trim="where.status">
           </DictSelection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="巡点检部门:">
-          <deptSelect v-model="where.groupId" />
+          <deptSelect v-model.trim="where.groupId" />
         </el-form-item>
         <el-form-item label="创建时间:">
           <el-date-picker
@@ -44,10 +44,10 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="设备分类:">
-          <equipmentSelect v-model="where.categoryLevelId" />
+          <equipmentSelect v-model.trim="where.categoryLevelId" />
         </el-form-item>
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
 
       </el-col>

+ 7 - 7
src/views/rulesManagement/maintenance/components/maintain-search.vue

@@ -9,24 +9,24 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划配置单号:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="规则名称:">
-          <el-input clearable v-model="where.ruleName" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.ruleName" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划配置名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="状态:">
-          <DictSelection dictName="规则状态" clearable v-model="where.status">
+          <DictSelection dictName="规则状态" clearable v-model.trim="where.status">
           </DictSelection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="执行部门:">
-          <deptSelect v-model="where.groupId" />
+          <deptSelect v-model.trim="where.groupId" />
         </el-form-item>
         <el-form-item label="创建时间:">
           <el-date-picker
@@ -44,10 +44,10 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="设备分类:">
-          <equipmentSelect v-model="where.categoryLevelId" />
+          <equipmentSelect v-model.trim="where.categoryLevelId" />
         </el-form-item>
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
     </el-row>

+ 6 - 6
src/views/rulesManagement/matterRules/components/matter-search.vue

@@ -9,16 +9,16 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="规则名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
 		<el-form-item label="规则状态:">
-		  <DictSelection dictName="规则状态" clearable v-model="where.status">
+		  <DictSelection dictName="规则状态" clearable v-model.trim="where.status">
 		  </DictSelection>
 		</el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="规则编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="创建时间:">
             <el-date-picker
@@ -36,16 +36,16 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="规则类型:">
-          <DictSelection dictName="规则类型" clearable v-model="where.type">
+          <DictSelection dictName="规则类型" clearable v-model.trim="where.type">
           </DictSelection>
         </el-form-item>
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="创建人:">
-          <el-input clearable v-model="where.userName" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.userName" placeholder="请输入" />
         </el-form-item>
 		<div class="ele-form-actions">
 		  <el-button

+ 3 - 3
src/views/rulesManagement/matterRules/components/product-search.vue

@@ -9,18 +9,18 @@
     <el-row :gutter="10">
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="编码">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="名称">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="型号">
-          <el-input clearable v-model="where.modelType" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.modelType" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 4 } : { md: 4 }">

+ 7 - 7
src/views/rulesManagement/measuringSubmit/components/patrol-search.vue

@@ -9,24 +9,24 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划配置单号:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="规则名称:">
-          <el-input clearable v-model="where.ruleName" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.ruleName" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划配置名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="状态:">
-          <DictSelection dictName="规则状态" clearable v-model="where.status">
+          <DictSelection dictName="规则状态" clearable v-model.trim="where.status">
           </DictSelection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="量具送检部门:">
-          <deptSelect v-model="where.groupId" />
+          <deptSelect v-model.trim="where.groupId" />
         </el-form-item>
         <el-form-item label="创建时间:">
           <el-date-picker
@@ -44,10 +44,10 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="设备分类:">
-          <equipmentSelect v-model="where.categoryLevelId" />
+          <equipmentSelect v-model.trim="where.categoryLevelId" />
         </el-form-item>
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
 
       </el-col>

+ 7 - 7
src/views/rulesManagement/planRules/components/inventory-search.vue

@@ -9,7 +9,7 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划配置单号:">
-          <el-input clearable v-model="where.planCode" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.planCode" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="分类:">
           <selectTree
@@ -27,17 +27,17 @@
             @getValue="codeListValue"
             :isAll="false"
           />
-          <!-- <DictSelection dictName="类型用途" clearable v-model="where.staus">
+          <!-- <DictSelection dictName="类型用途" clearable v-model.trim="where.staus">
 			</DictSelection> -->
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="盘点名称:">
-          <el-input clearable v-model="where.planName" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.planName" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="规则名称:">
           <el-select
-            v-model="where.ruleId"
+            v-model.trim="where.ruleId"
             class="w100"
             placeholder="请选择规则名称"
             :disabled="isBindPlan"
@@ -50,18 +50,18 @@
               :label="item.name"
             ></el-option>
           </el-select>
-          <!-- <el-input clearable v-model="where.ruleName" placeholder="请输入" /> -->
+          <!-- <el-input clearable v-model.trim="where.ruleName" placeholder="请输入" /> -->
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="盘点部门:">
           <deptSelect
-            v-model="where.executeGroupId"
+            v-model.trim="where.executeGroupId"
             @changeGroup="changeExecuteGroupId"
           />
         </el-form-item>
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">

+ 3 - 3
src/views/system/dictionary/components/dict-data-search.vue

@@ -13,7 +13,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.code"
+            v-model.trim="where.code"
             placeholder="请输入"
           />
         </el-form-item>
@@ -23,14 +23,14 @@
           <el-input
             clearable
             size="small"
-            v-model="where.name"
+            v-model.trim="where.name"
             placeholder="请输入"
           />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 4 } : { span: 4 }">
         <el-form-item label="应用类型">
-          <el-select v-model="where.appType" placeholder="请选择">
+          <el-select v-model.trim="where.appType" placeholder="请选择">
             <el-option
               v-for="item in options"
               :key="item.value"

+ 3 - 3
src/views/system/file/components/file-search.vue

@@ -9,19 +9,19 @@
     <el-row :gutter="15">
       <el-col :lg="6" :md="12">
         <el-form-item label="文件名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col :lg="6" :md="12">
         <el-form-item label="文件路径:">
-          <el-input clearable v-model="where.path" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.path" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col :lg="6" :md="12">
         <el-form-item label="上传人:">
           <el-input
             clearable
-            v-model="where.createNickname"
+            v-model.trim="where.createNickname"
             placeholder="请输入"
           />
         </el-form-item>

+ 2 - 2
src/views/system/login-record/components/login-record-search.vue

@@ -9,12 +9,12 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="用户账号:">
-          <el-input v-model="where.username" placeholder="请输入" clearable />
+          <el-input v-model.trim="where.username" placeholder="请输入" clearable />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="用户名:">
-          <el-input v-model="where.nickname" placeholder="请输入" clearable />
+          <el-input v-model.trim="where.nickname" placeholder="请输入" clearable />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">

+ 3 - 3
src/views/system/menu/components/menu-search.vue

@@ -9,17 +9,17 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="菜单名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="菜单地址:">
-          <el-input clearable v-model="where.url" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.url" placeholder="请输入" />
         </el-form-item>
       </el-col>
 <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="权限标识:">
-          <el-input clearable v-model="where.authority" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.authority" placeholder="请输入" />
         </el-form-item>
       </el-col> -->
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">

+ 2 - 2
src/views/system/operation-record/components/operation-record-search.vue

@@ -9,12 +9,12 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="用户账号:">
-          <el-input clearable v-model="where.username" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.username" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="操作模块:">
-          <el-input clearable v-model="where.module" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.module" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">

+ 3 - 3
src/views/system/organization/components/org-user-search.vue

@@ -12,7 +12,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.jobNumber"
+            v-model.trim="where.jobNumber"
             placeholder="请输入工号"
           />
         </el-form-item>
@@ -25,7 +25,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.loginName"
+            v-model.trim="where.loginName"
             placeholder="请输入用户账号"
           />
         </el-form-item>
@@ -35,7 +35,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.name"
+            v-model.trim="where.name"
             placeholder="请输入姓名"
           />
         </el-form-item>

+ 3 - 3
src/views/system/role/components/role-search.vue

@@ -9,17 +9,17 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="角色名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织名称:">
-          <el-input clearable v-model="where.groupName" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.groupName" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="备注:">
-          <el-input clearable v-model="where.comments" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.comments" placeholder="请输入" />
         </el-form-item>
       </el-col> -->
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">

+ 3 - 3
src/views/system/user/components/user-search.vue

@@ -9,19 +9,19 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="用户账号:">
-          <el-input clearable v-model="where.loginName" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.loginName" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="用户名:">
-          <el-input clearable v-model="where.nickname" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.nickname" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="性别:">
           <el-select
             clearable
-            v-model="where.sex"
+            v-model.trim="where.sex"
             placeholder="请选择"
             class="ele-fluid"
           >

+ 3 - 3
src/views/technology/control/components/user-search.vue

@@ -9,17 +9,17 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">

+ 5 - 5
src/views/technology/parameter/components/user-search.vue

@@ -9,19 +9,19 @@
     <el-row>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数默认值:">
           <el-input
             clearable
-            v-model="where.defaultValue"
+            v-model.trim="where.defaultValue"
             placeholder="请输入"
           />
         </el-form-item>
@@ -29,7 +29,7 @@
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数分类:">
           <el-select
-            v-model="where.categoryType"
+            v-model.trim="where.categoryType"
             filterable
             placeholder="请选择"
           >
@@ -45,7 +45,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">

+ 3 - 3
src/views/technology/productParam/components/product-search.vue

@@ -9,18 +9,18 @@
     <el-row :gutter="10">
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="编码">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="名称">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="型号">
-          <el-input clearable v-model="where.modelType" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.modelType" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 4 } : { md: 4 }">

+ 3 - 3
src/views/technology/productParam/components/user-search.vue

@@ -12,7 +12,7 @@
         <el-form-item label="产品编码:">
           <el-input
             clearable
-            v-model="where.categoryCode"
+            v-model.trim="where.categoryCode"
             placeholder="请输入"
           />
         </el-form-item>
@@ -21,14 +21,14 @@
         <el-form-item label="产品名称:">
           <el-input
             clearable
-            v-model="where.categoryName"
+            v-model.trim="where.categoryName"
             placeholder="请输入"
           />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
 

+ 4 - 4
src/views/technology/production/components/parameter/components/user-search.vue

@@ -9,19 +9,19 @@
     <el-row>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数默认值:">
           <el-input
             clearable
-            v-model="where.defaultValue"
+            v-model.trim="where.defaultValue"
             placeholder="请输入"
           />
         </el-form-item>
@@ -29,7 +29,7 @@
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数分类:">
           <el-select
-            v-model="where.categoryType"
+            v-model.trim="where.categoryType"
             filterable
             placeholder="请选择"
           >

+ 4 - 4
src/views/technology/production/components/user-search.vue

@@ -9,18 +9,18 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="工序编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="工序名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="控制码:" prop="controlId">
-            <el-select v-model="where.controlId" style="width: 100%">
+            <el-select v-model.trim="where.controlId" style="width: 100%">
               <el-option
                 v-for="item in controlList"
                 :key="item.id"
@@ -33,7 +33,7 @@
         </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
 

+ 2 - 2
src/views/technology/production/components/workCenter-search.vue

@@ -10,12 +10,12 @@
 
         <el-col v-bind="styleResponsive ? { sm: 10 } : { span: 10 }">
           <el-form-item label="工作中心编码:">
-            <el-input clearable v-model="where.code" placeholder="请输入" />
+            <el-input clearable v-model.trim="where.code" placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { sm: 10 } : { span: 10 }">
           <el-form-item label="工作中心名称:">
-            <el-input clearable v-model="where.name" placeholder="请输入" />
+            <el-input clearable v-model.trim="where.name" placeholder="请输入" />
           </el-form-item>
         </el-col>
   

+ 4 - 4
src/views/technology/route/components/product-search.vue

@@ -9,22 +9,22 @@
     <el-row :gutter="10">
       <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
         <el-form-item label="产品编码">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
         <el-form-item label="产品名称">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
         <el-form-item label="牌号">
-          <el-input clearable v-model="where.brandNum" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.brandNum" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
         <el-form-item label="型号">
-          <el-input clearable v-model="where.modelType" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.modelType" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">

+ 4 - 4
src/views/technology/route/components/production/components/parameter/components/user-search.vue

@@ -9,19 +9,19 @@
     <el-row>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数默认值:">
           <el-input
             clearable
-            v-model="where.defaultValue"
+            v-model.trim="where.defaultValue"
             placeholder="请输入"
           />
         </el-form-item>
@@ -29,7 +29,7 @@
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数分类:">
           <el-select
-            v-model="where.categoryType"
+            v-model.trim="where.categoryType"
             filterable
             placeholder="请选择"
           >

+ 3 - 3
src/views/technology/route/components/production/components/user-search.vue

@@ -9,19 +9,19 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="工序编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="工序名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="性别:">
           <el-select
             clearable
-            v-model="where.sex"
+            v-model.trim="where.sex"
             placeholder="请选择"
             class="ele-fluid"
           >

+ 5 - 5
src/views/technology/route/components/user-search.vue

@@ -9,17 +9,17 @@
     <el-row>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="工艺路线组编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="工艺路线名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="生产版本:">
-          <el-select v-model="where.produceVersionId" filterable placeholder="请选择" :style="{ width: '100%' }">
+          <el-select v-model.trim="where.produceVersionId" filterable placeholder="请选择" :style="{ width: '100%' }">
               <el-option v-for="item in versionList" :key="item.code" :label="item.code + '-' + item.name"
                 :value="item.id">
               </el-option>
@@ -28,7 +28,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="状态:" label-width="70px">
-          <el-select v-model="where.status" filterable placeholder="请选择" style="width: 100%">
+          <el-select v-model.trim="where.status" filterable placeholder="请选择" style="width: 100%">
             <el-option
               v-for="item in statusList"
               :key="item.value"
@@ -44,7 +44,7 @@
     <el-row>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 18, md: 12 } : { span: 18 }" style="display: flex;justify-content: flex-end">

+ 4 - 4
src/views/technology/stepManagement/components/parameter/components/user-search.vue

@@ -9,19 +9,19 @@
     <el-row>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数默认值:">
           <el-input
             clearable
-            v-model="where.defaultValue"
+            v-model.trim="where.defaultValue"
             placeholder="请输入"
           />
         </el-form-item>
@@ -29,7 +29,7 @@
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="参数分类:">
           <el-select
-            v-model="where.categoryType"
+            v-model.trim="where.categoryType"
             filterable
             placeholder="请选择"
           >

+ 4 - 4
src/views/technology/stepManagement/components/user-search.vue

@@ -9,22 +9,22 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="工序编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="工序名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <!-- <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
         <el-form-item label="控制码:" prop="controlId">
-            <el-select v-model="where.controlId" >
+            <el-select v-model.trim="where.controlId" >
               <el-option
                 v-for="item in controlList"
                 :key="item.id"

+ 3 - 3
src/views/technology/stepManagement/components/workCenter-search.vue

@@ -10,18 +10,18 @@
 
         <el-col v-bind="styleResponsive ? { sm: 6 } : { span: 6 }">
           <el-form-item label="工作中心编码:">
-            <el-input clearable v-model="where.code" placeholder="请输入" />
+            <el-input clearable v-model.trim="where.code" placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { sm: 6 } : { span: 6 }">
           <el-form-item label="工作中心名称:">
-            <el-input clearable v-model="where.name" placeholder="请输入" />
+            <el-input clearable v-model.trim="where.name" placeholder="请输入" />
           </el-form-item>
         </el-col>
 
         <el-col v-bind="styleResponsive ? { sm: 6 } : { span: 6 }">
           <el-form-item label="组织机构:">
-            <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+            <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
           </el-form-item>
         </el-col>
 

+ 4 - 4
src/views/technology/version/components/BOM-search.vue

@@ -9,19 +9,19 @@
     <el-row :gutter="10">
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="BOM编码">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="BOM名称">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="产品编码">
           <el-input
             clearable
-            v-model="where.categoryCode"
+            v-model.trim="where.categoryCode"
             placeholder="请输入"
           />
         </el-form-item>
@@ -30,7 +30,7 @@
         <el-form-item label="产品名称">
           <el-input
             clearable
-            v-model="where.categoryName"
+            v-model.trim="where.categoryName"
             placeholder="请输入"
           />
         </el-form-item>

+ 3 - 3
src/views/technology/version/components/route-search.vue

@@ -9,12 +9,12 @@
     <el-row>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="工艺路线组编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="工艺路线名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
 <!--      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
@@ -22,7 +22,7 @@
           <el-input
             clearable
             disabled
-            v-model="where.version"
+            v-model.trim="where.version"
             placeholder="请输入"
           />
         </el-form-item>

+ 5 - 5
src/views/technology/version/components/user-search.vue

@@ -9,19 +9,19 @@
     <el-row>
       <!-- <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="产品编码:">
-          <el-input clearable v-model="where.categoryCode" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.categoryCode" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="产品名称:">
-          <el-input clearable v-model="where.categoryName" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.categoryName" placeholder="请输入" />
         </el-form-item>
       </el-col> -->
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="版本号:">
           <el-input
             clearable
-            v-model="where.code"
+            v-model.trim="where.code"
             placeholder="请输入"
           />
         </el-form-item>
@@ -30,14 +30,14 @@
         <el-form-item label="版本名称:">
           <el-input
             clearable
-            v-model="where.name"
+            v-model.trim="where.name"
             placeholder="请输入"
           />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">

+ 5 - 5
src/views/technology/work/components/user-search.vue

@@ -9,7 +9,7 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="所属工厂:">
-          <el-select v-model="where.factoryId" filterable placeholder="所属工厂">
+          <el-select v-model.trim="where.factoryId" filterable placeholder="所属工厂">
             <el-option
               v-for="item in flist"
               :key="item.id"
@@ -22,18 +22,18 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="工作中心编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="工作中心名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="工作中心类别:">
-          <el-select v-model="where.categoryType" filterable placeholder="工作中心类别">
+          <el-select v-model.trim="where.categoryType" filterable placeholder="工作中心类别">
             <el-option
               v-for="item in categoryTypes"
               :key="item.code"
@@ -46,7 +46,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">

+ 4 - 4
src/views/versionManage/components/index-search.vue

@@ -9,7 +9,7 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
@@ -18,20 +18,20 @@
           <ele-tree-select
             clearable
             :data="typeList"
-            v-model="where.type"
+            v-model.trim="where.type"
             placeholder="请选择"
             valueKey="id"
             labelKey="name"
             childrenKey="subList"
           />
-<!--          <el-select v-model="where.type" filterable style="width: 100%;" :disabled="type=='view'">-->
+<!--          <el-select v-model.trim="where.type" filterable style="width: 100%;" :disabled="type=='view'">-->
 <!--            <el-option v-for="item in typeList" :key="item.id" :value="item.id" :label="item.name"></el-option>-->
 <!--          </el-select>-->
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection data-type="Array" v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection data-type="Array" v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">

+ 3 - 3
src/views/workforceManagement/schedule/components/use-search.vue

@@ -4,13 +4,13 @@
     <el-row :gutter="10">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="名称:">
-          <el-input clearable size="small" v-model="where.name" placeholder="请输入排班组名称"/>
+          <el-input clearable size="small" v-model.trim="where.name" placeholder="请输入排班组名称"/>
         </el-form-item>
       </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="状态:">
-          <el-select v-model="where.status" style="width: 100%">
+          <el-select v-model.trim="where.status" style="width: 100%">
             <el-option label="发布" :value="1"/>
             <el-option label="草稿" :value="0"/>
           </el-select>
@@ -18,7 +18,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:" label-width="100px">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">

+ 36 - 3
src/views/workforceManagement/team/components/edit.vue

@@ -155,6 +155,17 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+          
+          <el-col :span="8" style="margin-bottom: 22px">
+            <el-form-item label="状态:" prop="">
+              <el-select v-model="form.status" placeholder="" filterable>
+              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+            </el-form-item>
+          </el-col>
+
         </el-row>
       </el-card>
       <el-card
@@ -203,13 +214,22 @@
           workCenterIds: [],
           workshopId: [],
           factoryId: '',
-          produceVersionId: ''
+          produceVersionId: '',
+          status: 1
         };
       };
       return {
         defaultForm,
         factoryList: [],
 
+
+        
+        statusList: [
+
+                { label: '失效', value: 0 },
+                { label: '生效', value: 1 }
+            ],
+
         // 表单数据
         form: { ...defaultForm() },
         // 表单验证规则
@@ -290,7 +310,7 @@
           await this.getlistFactoryLineByParentId();
         }
         this.getVersionList();
-        this.getlistByProductionLineId();
+
       },
       /* 保存编辑 */
       save() {
@@ -353,6 +373,14 @@
 
       // 获取厂房
       change_factoryId() {
+
+        this.form.workshopPlanId = ''
+        this.workshopPlanList = [];
+        this.form.workshopId = '';
+        this.options.workshopId = [];
+        this.form.productionLineId = '';
+        this.options.productionLineId = [];
+
         let par = {
           type: 2,
           parentId: this.form.factoryId,
@@ -361,6 +389,11 @@
         getFactoryarea(par).then((res) => {
           this.workshopPlanList = res.list;
         });
+
+         this.form.workCenterIds = ''
+        this.options.workCenterIds = [];
+
+        this.getlistByProductionLineId();
       },
 
       // 获取车间
@@ -387,7 +420,7 @@
       },
       // 获取工位
       getlistByProductionLineId() {
-        return work.list({ pageNum: 1, size: -1 }).then((res) => {
+        return work.list({ pageNum: 1, size: -1, factoryId: this.form.factoryId }).then((res) => {
           this.options.workCenterIds = res.list.map((n) => {
             return {
               value: n.id,

+ 77 - 0
src/views/workforceManagement/team/components/search.vue

@@ -0,0 +1,77 @@
+<!-- 搜索表单 -->
+<template>
+  <el-form
+    label-width="80px"
+    class="ele-form-search"
+    @keyup.enter.native="search"
+    @submit.native.prevent
+  >
+    <el-row>
+
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+        <el-form-item label="名称:">
+          <el-input
+            clearable
+            v-model.trim="where.name"
+            placeholder="请输入"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+        <el-form-item label=":">
+ 
+        </el-form-item>
+      </el-col>
+
+
+      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
+        <div class="ele-form-actions">
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            class="ele-btn-icon"
+            @click="search"
+          >
+            查询
+          </el-button>
+          <el-button @click="reset">重置</el-button>
+        </div>
+      </el-col>
+ 
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+  export default {
+    data() {
+      // 默认表单数据
+      const defaultWhere = {
+
+        name: '',
+  
+      };
+      return {
+        // 表单数据
+        where: { ...defaultWhere },
+      };
+    },
+    computed: {
+      // 是否开启响应式布局
+      styleResponsive() {
+        return this.$store.state.theme.styleResponsive;
+      }
+    },
+    methods: {
+      /* 搜索 */
+      search() {
+        this.$emit('search', this.where);
+      },
+      /*  重置 */
+      reset() {
+        this.where = { ...this.defaultWhere };
+        this.search();
+      }
+    }
+  };
+</script>

+ 15 - 0
src/views/workforceManagement/team/index.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="ele-body">
+
+
+
     <el-card shadow="never">
+
+               <!-- 搜索表单 -->
+               <search @search="reload" />
+               
       <ele-pro-table
         ref="table"
         :columns="columns"
@@ -60,8 +67,10 @@
   import edit from './components/edit.vue';
   import setclasses from './components/setclasses.vue';
   import { getteampage, deleteteam } from '@/api/workforceManagement/team';
+  import search from './components/search.vue';
   export default {
     components: {
+      search,
       edit,
       setclasses
     },
@@ -153,6 +162,12 @@
             this.$message.error(e.message);
           });
       },
+
+          /* 刷新表格 */
+    reload(where) {
+      this.$refs.table.reload({ page: 1, where: where });
+    },
+
       done () {
         this.$refs.table.reload({
           page: 1