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

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

@@ -786,9 +786,12 @@
                                         <!-- </p> -->
                                         <em>
                                             <!-- {{item.content}} -->
-                                            <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.content.name'></ww-open-data></p>
-                                            <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate != 1">{{item.content.name}}</p>
-                                            {{item.content.con}}
+                                            <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate == 1">
+                                                <span>{{item.content.msg1}}</span>
+                                                <ww-open-data type='userName' :openid='item.content.msg2'></ww-open-data>
+                                                <span>{{item.content.msg3}}</span>
+                                            </p>
+                                            <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate != 1">{{item.content}}</p>
                                         </em>
                                     </div>
                                     <span>{{item.createTime | relativeTime}}</span>
@@ -2445,18 +2448,19 @@
                 res => {
                     if (res.code == "ok") {
                         for(var i in res.data) {
-                            if(res.data[i].content.indexOf(res.data[i].userName) != '-1') {
+                            if(res.data[i].content.indexOf('$userName=') != '-1') {
                                 let obj = {
-                                    name: res.data[i].userName,
-                                    con: res.data[i].content.split(res.data[i].userName)[1]
+                                    msg1: res.data[i].content.split('$')[0],
+                                    msg2: res.data[i].content.split('$')[1].split('=')[1],
+                                    msg3: res.data[i].content.split('$')[2]
                                 }
                                 res.data[i].content = obj
                             } else {
-                                let obj = {
-                                    name: '',
-                                    con: res.data[i].content
-                                }
-                                res.data[i].content = obj
+                                // let obj = {
+                                //     name: '',
+                                //     con: res.data[i].content
+                                // }
+                                // res.data[i].content = obj
                             }
                         }
                         this.commentList = res.data

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

@@ -448,9 +448,12 @@
                                         <p v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.userName'></ww-open-data></p>
                                         <em>
                                             <!-- {{item.content}} -->
-                                            <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.content.name'></ww-open-data></p>
-                                            <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate != 1">{{item.content.name}}</p>
-                                            {{item.content.con}}
+                                            <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate == 1">
+                                                <span>{{item.content.msg1}}</span>
+                                                <ww-open-data type='userName' :openid='item.content.msg2'></ww-open-data>
+                                                <span>{{item.content.msg3}}</span>
+                                            </p>
+                                            <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate != 1">{{item.content}}</p>
                                         </em>
                                     </div>
                                     <span>{{item.createTime | relativeTime}}</span>
@@ -1321,18 +1324,19 @@ import { error } from 'dingtalk-jsapi';
                 res => {
                     if (res.code == "ok") {
                         for(var i in res.data) {
-                            if(res.data[i].content.indexOf(res.data[i].userName) != '-1') {
+                            if(res.data[i].content.indexOf('$userName=') != '-1') {
                                 let obj = {
-                                    name: res.data[i].userName,
-                                    con: res.data[i].content.split(res.data[i].userName)[1]
+                                    msg1: res.data[i].content.split('$')[0],
+                                    msg2: res.data[i].content.split('$')[1].split('=')[1],
+                                    msg3: res.data[i].content.split('$')[2]
                                 }
                                 res.data[i].content = obj
                             } else {
-                                let obj = {
-                                    name: '',
-                                    con: res.data[i].content
-                                }
-                                res.data[i].content = obj
+                                // let obj = {
+                                //     name: '',
+                                //     con: res.data[i].content
+                                // }
+                                // res.data[i].content = obj
                             }
                         }
                         this.commentList = res.data

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)