ggooalice 2 éve
szülő
commit
221f0a3985

+ 8 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -645,7 +645,7 @@
                             </el-form-item>
                             <!-- 相关维度 -->
                             <el-form-item :label="yonghuUser.customDegreeName" v-if="domain.projectId && yonghuUser.customDegreeActive == 1" :rules="user.timeType.customDegreeStatus == 1 && domain.wuduList.length != 0 ? { required: true, message: $t('defaultText.pleaseChoose') + yonghuUser.customDegreeName, trigger: ['change','blur'] } : null" :prop="'domains.' + index + '.degreeId'">
-                                <el-select v-model="domain.degreeId" :disabled="!domain.canEdit" clearable :placeholder="$t('defaultText.pleaseChoose')">
+                                <el-select v-model="domain.degreeId" :disabled="!domain.canEdit" clearable :placeholder="$t('defaultText.pleaseChoose')" filterable>
                                     <el-option v-for="item in domain.wuduList" :key="item.value" :label="item.name" :value="item.id">
                                     </el-option>
                                 </el-select>
@@ -914,7 +914,7 @@
                 <!-- 自定义维度  -->
                 <div class="zhoFel" v-if="user.timeType.customDegreeActive">
                     <p>{{user.timeType.customDegreeName}}</p>
-                    <el-select v-model="zhoBao.degreeId" :placeholder="$t('defaultText.pleaseChoose')" clearable="true" style="width: 355px">
+                    <el-select v-model="zhoBao.degreeId" :placeholder="$t('defaultText.pleaseChoose')" clearable="true" style="width: 355px" filterable>
                         <el-option v-for="item in zhoBao.wuduList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                     
@@ -5257,6 +5257,9 @@
                                         formData.append("professionProgress", "[]")
                                         if (zhoD[j].groupId) {
                                             formData.append("groupId",zhoD[j].groupId)
+                                        } else {
+                                            //解决后台groupId数组越界的问题
+                                            formData.append("groupId",0)
                                         }
                                         zhoD[j].stage ? formData.append("stage", zhoD[j].stage) : formData.append("stage", '');
                                         formData.append("createDate",zhoD.zhoDataTime)
@@ -5331,6 +5334,9 @@
                                         formData.append("professionProgress", "[]")
                                         if (zhoD[j].groupId) {
                                             formData.append("groupId",zhoD[j].groupId)
+                                        } else {
+                                            //解决后台groupId数组越界的问题
+                                            formData.append("groupId",0)
                                         }
                                         zhoD[j].stage ? formData.append("stage", zhoD[j].stage) : formData.append("stage", '');
                                         formData.append("createDate",zhoD.zhoDataTime)