合并分支 'crs' 到 'master'

src/components/admittance/technical/technical.vue

@@ -11,7 +11,7 @@
                         </span>
                         <span class="searchVal">
                             <span style="width: 90px;">产品名称：</span>
-                            <el-select v-model="productVal" placeholder="请选择" clearable>
+                            <el-select v-model="productVal" placeholder="请选择" clearable @change="search">
                                 <el-option
                                         v-for="item in productList"
                                         :key="item.id"

src/components/basicInformation/person/person.vue

@@ -11,7 +11,7 @@
                         </span>
                         <span class="searchVal">
                             <span>角色：</span>
-                            <el-select v-model="searchRole" placeholder="请选择" clearable>
+                            <el-select v-model="searchRole" placeholder="请选择" clearable @change="search">
                                 <el-option
                                     v-for="item in roleList"
                                     :key="item.id"
@@ -22,7 +22,7 @@
                         </span>
                         <span class="searchVal">
                             <span>单位：</span>
-                            <el-select v-model="searchUnit" placeholder="请选择" clearable>
+                            <el-select v-model="searchUnit" placeholder="请选择" clearable @change="search">
                                 <el-option
                                         v-for="item in unitList"
                                         :key="item.id"
@@ -239,7 +239,7 @@ export default {
         display: flex;
     }
     .person .content .searchVal{
-        width: 280px;
+        width: 275px;
         display: flex;
         font-size: 18px;
         color: #4663a6;
@@ -278,7 +278,6 @@ export default {
         text-align: center;
         background: #4877e6;
         cursor: pointer;
-        margin-left: 30px;
         border-radius: 4px;
         color: #fff;
         font-size: 18px;