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

fhKeeper/formulahousekeeper/timesheet_h5/src/views/msg/index.vue

@@ -7,12 +7,13 @@
                 <van-cell @click="readMsg(index)" v-for="(item,index) in list" :key="index" 
                  :label="item.time.replace('T', ' ')" >
                 <template #title>
-                    <span v-if="user.userNameNeedTranslate == 1 && item.msg != null && item.indexOf('$userName=') != -1">
-                        <span>{{item.split('$')[0]}}</span>
-                        <ww-open-data type='userName' :openid='getmsgtext(item.msg)'></ww-open-data>
-                        <span>{{item.split('$')[2]}}</span>
+                    <span v-if="user.userNameNeedTranslate == 1 && item.msg != null && item.msg.indexOf('$userName=') != -1">
+                        <span>{{item.msg1}}</span>
+                        <ww-open-data type='userName' :openid='item.msg2'></ww-open-data>
+                        <span>{{item.msg3}}</span>
                     </span>
-                    <span v-else>{{item.msg}}</span>
+                    <span v-else-if="item.msg != null">{{item.msg}}</span>
+                    <span v-else>{{msgType[item.type]}}</span>
                 </template>
                 <div >
                     <span v-if="item.checked == 1" style="color:green">已读</span>
@@ -103,6 +104,13 @@
                         this.loading = false;
                         this.finished = true;
                         this.list = res.data;
+                        for(let i in this.list){
+                            if(this.list[i].msg != null && this.list[i].msg.indexOf('$userName=') != -1){
+                                this.list[i].msg1 = this.list[i].msg.split('$')[0]
+                                this.list[i].msg2 = this.list[i].msg.split('$')[1].split('=')[1]
+                                this.list[i].msg3 = this.list[i].msg.split('$')[2]
+                            }
+                        }
                     } else {
                         this.$toast.fail('获取失败');
                     }

fhKeeper/formulahousekeeper/timesheet_h5/src/views/task/editask.vue

@@ -51,7 +51,14 @@
                 </van-popup>
                 <!-- 执行人 -->
                 <div style="border: 0.5px solid #87c3ff;margin:0.2rem;position:relative" v-for="item,index in taskform.executorList" :key="index">
-                    <van-field v-model="item.executorName" :label="'执行人' + (index + 1)" placeholder="请选择执行人" @click="executorChange(item,index)" readonly clickable></van-field>
+                    <van-field v-model="item.executorName" :label="'执行人' + (index + 1)" placeholder="请选择执行人" @click="executorChange(item,index)" readonly clickable>
+                        <template #input>
+                            <span v-if="!item.executorName"></span>
+                            <span v-else-if="user.userNameNeedTranslate != 1">{{item.executorName}}</span>
+                            <span v-else><ww-open-data type='userName' :openid='item.executorName'></ww-open-data></span>
+                        </template>
+                    </van-field>
+                    
                     <van-field label="计划工时">
                         <template #input>
                             <van-stepper v-model="item.planHours" :disabled="!canEdit"/><span>{{'\u3000h'}}</span>