修改其他账号相关维度的问题

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

@@ -33,6 +33,10 @@
                         <el-col :span="5" ><span class="gray_label">实际完成日期:</span></el-col><el-col :span="7" ><span>
                             {{project.finishDate==null?'-':project.finishDate}}</span></el-col>
                     </el-row>
+                    <el-row :gutter="10" v-if="yonghuUser.customDegreeActive == 1">
+                        <el-col :span="5" ><span class="gray_label">{{yonghuUser.customDegreeName}}:</span></el-col><el-col :span="18" ><span>
+                            {{project.associateDegreeNames}}</span></el-col>
+                    </el-row>
                 </div>
                 <div class="box" style="margin-top:10px;">
                     <div><label>相关人员</label>
@@ -442,7 +446,8 @@
                 title: "",
                 rules: {
                     name: [{ required: true, message: "请输入项目名称", trigger: "blur" }],
-                }
+                },
+                yonghuUser: []
             };
         },
         filters: {
@@ -462,6 +467,24 @@
             }
         },
         methods: {
+            userssHu() {
+                this.http.post('/time-type/getCompanyTimeSetting',{ 
+                    companyId: this.user.companyId
+                },
+                res => {
+                    if (res.code == "ok") {
+                        this.yonghuUser = res.data
+                        console.log(this.yonghuUser)
+                    } 
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                    }
+                );
+            },
             getProgressData() {
                 this.http.post("/project-profession/getProgressData", {projectId: this.curProjectId},
                     res => {
@@ -1320,6 +1343,7 @@
             this.getProjectBaseData(this.curProjectId);
             this.getProjectNotifyUserList(this.curProjectId);
             this.getProgressData();
+            this.userssHu()
         }
     };
 </script>

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -194,7 +194,7 @@
                 <div class="panel" style="height:60px;">
                     <el-form :inline="true" :model="timeType"  style="margin-top:10px;">
                         <el-form-item label="维度名称 ">
-                            <el-input placeholder="请输入维度名称" size="small" v-model="timeType.customDegreeName" clearable> </el-input>
+                            <el-input placeholder="请输入维度名称" maxlength="6" size="small" v-model="timeType.customDegreeName" clearable> </el-input>
                         </el-form-item>
                         <el-form-item>
                             <el-button type="primary" size="small" @click="bianji()">数据维护</el-button>
@@ -208,7 +208,11 @@
         <!-- 维护数据 -->
         <el-dialog title="维护数据列表" show-header="false" v-if="subProjectVisible" :visible.sync="subProjectVisible" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <el-table :data="subProjectList" highlight-current-row  height="400" style="width: 100%;">
-            <el-table-column prop="id" width="60" label="序号"></el-table-column>
+            <el-table-column prop="id" width="60" label="序号">
+                <template slot-scope="scope" >
+                    {{scope.$index + 1}}
+                </template>
+            </el-table-column>
             <el-table-column prop="name" label="名称" ></el-table-column>
             <el-table-column label="操作" width="150">
                 <template slot-scope="scope" >

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -295,13 +295,13 @@
                              :underline="false" style="margin-left:5px;" @click="copyProject(index)">复制</el-link>
                     </el-form-item>
                     <!-- 相关维度 -->
-                    <!-- <el-form-item :label="yonghuUser.customDegreeName" v-if="domain.projectId && yonghuUser.customDegreeActive == 1">
+                    <el-form-item :label="yonghuUser.customDegreeName" v-if="domain.projectId && yonghuUser.customDegreeActive == 1">
                             <el-select v-model="domain.degreeId" clearable placeholder="请选择相关维度">
                                 <el-option v-for="item in domain.wuduList" :key="item.value" :label="item.name" :value="item.id">
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                    </el-form-item> -->
+                    <!-- </el-form-item> -->
 
                     <el-form-item v-if="reportTimeType.type == 3" label="用时占比" :prop="'domains.' + index + '.'+timeFields[reportTimeType.type]"
                         :rules="{ required: true, message: '请设置用时占比', trigger: 'blur' }">
@@ -1182,6 +1182,7 @@
                 res => {
                     if (res.code == "ok") {
                         this.workForm.domains[index].wuduList = res.data
+                        this.workForm = this.workForm
                     } 
                 },
                 error => {