2022.9.14 八爪鱼，项目列表

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -65,7 +65,7 @@
                 <template slot-scope="scope">
                     <el-button size="mini"  @click="editClick('A', scope.row)">增加人数</el-button>
                     <el-button size="mini"  @click="editClick('B', scope.row)">修改有效期</el-button>
-                    <el-button size="mini"  @click="editClick('F', scope.row)" :disabled="!(scope.row.dingdingCorpid || scope.row.wxCorpid)">考勤同步</el-button>
+                    <el-button size="mini"  @click="editClick('F', scope.row)" :disabled="!(scope.row.dingdingCorpid || scope.row.wxCorpid)">考勤同步设置</el-button>
                     <el-button size="mini"  @click="editClick('C', scope.row)">修改版本</el-button>
                     <el-button size="mini"  @click="editClick('D', scope.row)" :disabled="scope.row.setMeal">设为已签约</el-button>
                     <el-button size="mini"  @click="editClick('G', scope.row)">其他设置</el-button>
@@ -675,7 +675,15 @@
                 for(let m in this.roleIdArr){
                     roleIds += this.roleIdArr[m] + ','
                 }
-                if(roleIds){roleIds = roleIds.substring(0,roleIds.length - 1)}
+                if(roleIds){
+                    roleIds = roleIds.substring(0,roleIds.length - 1)
+                }else{
+                    this.$message({
+                        message: '请选择要开通的角色',
+                        type: 'error'
+                    })
+                    return
+                }
                 this.http.post('/company-report/update',{
                     companyId: this.dialogData.id,
                     formIds: ids,

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -1071,8 +1071,11 @@
         <el-dialog title="批量设置项目经理" v-if="batchInchargerDialog" :visible.sync="batchInchargerDialog" width="30%">
             <el-form model="" label-width="120px">
                 <el-form-item label="设置项目经理">
-                    <el-select v-model="paramInchargerId" placeholder="请选择项目经理" style="width: 80%">
-                        <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                    <el-select v-model="paramInchargerId" placeholder="请选择项目经理" style="width: 80%" filterable clearable>
+                        <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id">
+                            <span style="float: left">{{item.name}}</span>
+                            <span style="float: right; color: #8492a6;" v-if="user.companyId == 936">{{ item.jobNumber }}</span>
+                        </el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
@@ -3914,7 +3917,7 @@ a {
         },
         created() {
             let height = window.innerHeight;
-            this.tableHeight = height - 195;
+            this.tableHeight = height - 225;
             const that = this;
             window.onresize = function temp() {
                 that.tableHeight = window.innerHeight - 195;