Browse Source

Merge branch '02/23reviewBUG' into test

mo 3 years ago
parent
commit
13d6900508

+ 1 - 1
src/views/HumanResources/index.vue

@@ -182,7 +182,7 @@
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="mobileNo" label="手机号">
+          <el-table-column align="center" prop="mobileNo" label="手机号" width="140px">
             <template slot-scope="scope">
               <div>
                 <copy-text>{{ scope.row.mobileNo }}</copy-text>

+ 1 - 0
src/views/categroyManager/specialSetup/chargesList.vue

@@ -7,6 +7,7 @@
           <el-select
             placeholder="请选择分部"
             v-model="searchForm.organId"
+            filterable
             clearable
           >
             <el-option

+ 1 - 0
src/views/categroyManager/specialSetup/musicCourseFee.vue

@@ -11,6 +11,7 @@
         <el-form-item prop="organId">
           <el-select placeholder="请选择分部"
                      v-model="searchForm.organId"
+                     filterable
                      clearable>
             <el-option v-for="(item, index) in selects.branchs"
                        :label="item.name"

+ 1 - 1
src/views/chargeManager/one.vue

@@ -55,7 +55,7 @@
     >
       <el-form :model="form" :rules="rules" ref="ruleForm">
         <el-form-item label="所属分部" prop="organId" :label-width="formLabelWidth">
-          <el-select v-model.trim="form.organId" :disabled="formActionTitle === 'update'" placeholder="请选择所属分部">
+          <el-select v-model.trim="form.organId" filterable :disabled="formActionTitle === 'update'" placeholder="请选择所属分部">
             <el-option
               v-for="(item, index) in selects.branchs"
               :key="index"

+ 2 - 2
src/views/chargeManager/share-model.vue

@@ -2,7 +2,7 @@
     <div>
         <el-form :model="form" :rules="rules" ref="ruleForm">
             <el-form-item label="所属分部" prop="organId" :label-width="formLabelWidth">
-                <el-select v-model.trim="form.organId" :disabled="formActionTitle === 'update'" placeholder="请选择所属分部">
+                <el-select v-model.trim="form.organId" :disabled="formActionTitle === 'update'" filterable placeholder="请选择所属分部">
                     <el-option
                     v-for="item in selects.branchs"
                     :key="item.id"
@@ -305,4 +305,4 @@ export default {
     text-align: right;
     margin-top: 20px;
   }
-</style>
+</style>

+ 2 - 2
src/views/chargeManager/two.vue

@@ -21,7 +21,7 @@
               :rules="{
                 required: true, message: '请选择所属分部', trigger: 'change'
               }">
-              <el-select v-model.trim="domain.organId" clearable :disabled="domain.disabled" placeholder="请选择所属分部">
+              <el-select v-model.trim="domain.organId" clearable filterable :disabled="domain.disabled" placeholder="请选择所属分部">
                 <el-option
                   v-for="(item, index1) in selects.branchs"
                   :key="index1"
@@ -387,4 +387,4 @@ export default {
   width: 180px;
   text-align: center;
 }
-</style>
+</style>