Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -257,8 +257,8 @@
                     <el-cascader v-model="insertForm.departmentId" placeholder="请选择部门" style="width: 100%"
                     :options="option" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false"  clearable></el-cascader>
                 </el-form-item>
-                <el-form-item label="直属上司">
-                    <el-select v-model="insertForm.superiorId" placeholder="请选择角色" style="width: 100%">
+                <el-form-item label="直属上级">
+                    <el-select v-model="insertForm.superiorId" placeholder="请选择角色" style="width: 100%" filterable>
                         <el-option v-for="item in users" :label="item.name" :value="item.id" :key="item.id">
                             <span style="float: left">{{item.name}}</span>
                             <span style="float: right; color: #8492a6; font-size: 13px">{{item.departmentName}}</span>
@@ -275,7 +275,7 @@
                 </el-form-item>
                 <el-form-item :label="item.name" v-for="item,index in userCustomConfig" :key="item.id">
                     <el-select v-if="item.type == 0" v-model="insertForm[suoying[index]]" placeholder="请选择" clearable style="width: 100%">
-                        <el-option v-for="option in item.itemList" :label="option.name" :value="option.id" :key="option.id">
+                        <el-option v-for="option in item.itemList" :label="option.name" :value="option.name" :key="option.id">
                         </el-option>
                     </el-select>
                     <el-input v-else v-model="insertForm[suoying[index]]" placeholder="请输入" clearable></el-input>
@@ -794,7 +794,8 @@
                 // jsonStr = jsonStr.substring(0,jsonStr.length - 1)
                 // let jsonStr = []
                 for(let i in this.customConfigList){
-                    if(!this.customConfigList[i].name){
+                    let text = this.customConfigList[i].name.trim()
+                    if(!text){
                         this.customConfigList.splice(i,1)
                     }
                 }
@@ -922,7 +923,7 @@
                         this.userCustomConfig = JSON.parse(JSON.stringify(res.data))
                         for(let i in this.userCustomConfig){
                             if(this.userCustomConfig[i].type == 0){
-                                if(this.insertForm[this.suoying[i]]){this.insertForm[this.suoying[i]] = this.insertForm[this.suoying[i]]*1}
+                                
                                 this.http.post('/sub-user-custom/list',{
                                     userCustomId: this.userCustomConfig[i].id
                                 },res => {
@@ -1537,6 +1538,7 @@
                                 position: res.data.position,
                                 certJson: res.data.certList,
                                 plateMap: {},
+                                superiorId: res.data.superiorId,
                                 plate1: res.data.plate1,
                                 plate2: res.data.plate2,
                                 plate3: res.data.plate3,
@@ -1649,6 +1651,9 @@
                         if (this.insertForm.id != null) {
                             form.id = this.insertForm.id;
                         }
+                        if (this.insertForm.superiorId){
+                            form.superiorId = this.insertForm.superiorId
+                        }
                         if (this.insertForm.costApplyDate != null) {
                             form.costApplyDate = this.insertForm.costApplyDate;
                         }