提交数据

fhKeeper/formulahousekeeper/timesheet_h5/src/App.vue

@@ -137,6 +137,19 @@ export default {
     box-sizing: border-box;
   }
   
+  .userNameClass_left {
+    display: inline-block;
+    width: 100px;
+  }
+  .userNameClass_right {
+    display: inline-block;
+    width: 150px;
+    float: right;
+    text-align: right;
+    overflow: hidden;
+    white-space:nowrap;
+    text-overflow: ellipsis;
+  }
 </style>
 
 

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

@@ -36,12 +36,21 @@
                             <div class="popupCon conBorder">
                                 <van-radio-group v-model="userRadio" v-if="user.userNameNeedTranslate == '1'">
                                     <van-radio v-for="item in userList" :key="item.id" :name="item" class="popupItem marginNone borderNone">
-                                        <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                        <!-- <ww-open-data type='userName' :openid='item.name'></ww-open-data> -->
+                                        <span class="userNameClass_left">
+                                            <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                        </span>
+                                        <span class="userNameClass_right">
+                                            {{ item.jobNumber }}
+                                        </span>
                                     </van-radio>
                                 </van-radio-group>
                                 <van-radio-group v-model="userRadio" v-else>
-                                    <van-radio v-for="item in userList" :key="item.id" :name="item" class="popupItem marginNone borderNone">{{
-                                        item.name }}</van-radio>
+                                    <van-radio v-for="item in userList" :key="item.id" :name="item" class="popupItem marginNone borderNone">
+                                    <!-- {{ item.name }} -->
+                                        <span class="userNameClass_left">{{item.name}}</span>
+                                        <span class="userNameClass_right">{{ item.jobNumber }}</span>
+                                    </van-radio>
                                 </van-radio-group>
                             </div>
                             <div class="popupBtn">

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

@@ -73,8 +73,9 @@
                     placeholder="请选择" @click="clikls()"/>
                 </van-form>
             </van-dialog>
-            <van-popup v-model="showPickerUser" position="bottom" ref="usersPopup">
-                <van-search v-model="userName" placeholder="输入员工姓名搜索" @search="onSearch" v-if="user.userNameNeedTranslate != '1'"></van-search>
+
+            <van-popup v-model="showPickerUser" position="bottom" ref="usersPopup" style="height: 90%">
+                <!-- <van-search v-model="userName" placeholder="输入员工姓名搜索" @search="onSearch" v-if="user.userNameNeedTranslate != '1'"></van-search>
                 <div style="minHeight:300px;">
                 <template v-if="user.userNameNeedTranslate == '1'">
                     <van-checkbox class="userCheckbox" v-for="(item) in userList" :key="item.id" v-model="item.isChecked" ><ww-open-data type='userName' :openid='item.name'></ww-open-data></van-checkbox>
@@ -83,8 +84,37 @@
                     <van-checkbox class="userCheckbox" v-for="(item) in userList" :key="item.id" v-model="item.isChecked" >{{item.name}}</van-checkbox>
                 </template>
                 <van-button style="width:100%;position: -webkit-sticky;position: sticky;bottom: 0;" @click="refreshParticipate();showPickerUser=false">确定</van-button>
+                </div> -->
+                <div class="popupDiv">
+                    <div class="popupSearch" v-if="user.userNameNeedTranslate != '1'">
+                        <van-search v-model="userName" placeholder="输入员工姓名搜索" @search="onSearch" shape="round" background="#F4F4F4"></van-search>
+                    </div>
+
+                    <div class="popupCon conBorder">
+                        <div class="popupConBox" v-if="user.userNameNeedTranslate == '1'">
+                            <van-checkbox class="popupItem marginNone borderNone" v-for="(item) in userList" :key="item.id" v-model="item.isChecked" >
+                                <span class="userNameClass_left">
+                                    <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                </span>
+                                <span class="userNameClass_right">
+                                    {{ item.jobNumber }}
+                                </span>
+                            </van-checkbox>
+                        </div>
+                        <div class="popupConBox" v-else>
+                            <van-checkbox class="popupItem marginNone borderNone" v-for="(item) in userList" :key="item.id" v-model="item.isChecked" >
+                                <span class="userNameClass_left">{{item.name}}</span>
+                                <span class="userNameClass_right">{{ item.jobNumber }}</span>
+                            </van-checkbox>
+                        </div>
+                    </div>
+
+                    <div class="popupBtn">
+                        <van-button style="width:100%;background: #1989fa;color: #ffffff;position: -webkit-sticky;position: sticky;bottom: 0;" round @click="refreshParticipate()" showPickerUser=false>确定</van-button>
+                    </div>
                 </div>
             </van-popup>
+
             <van-popup v-model="showPickerIncharger" position="bottom">
                 <van-picker show-toolbar :columns="inchargerUserList" value-key="name" @confirm="choseIncharger" @cancel="showPickerIncharger = false">
                     <template #option="item">

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

@@ -47,12 +47,18 @@
                         <div class="popupCon conBorder">
                             <div class="popupConBox" v-if="user.userNameNeedTranslate == '1'">
                                 <van-checkbox class="popupItem marginNone borderNone" v-for="(item) in showUserList" :key="item.id" v-model="item.isChecked" >
-                                    <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                    <span class="userNameClass_left">
+                                        <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                    </span>
+                                    <span class="userNameClass_right">
+                                        {{ item.jobNumber }}
+                                    </span>
                                 </van-checkbox>
                             </div>
                             <div class="popupConBox" v-else>
                                 <van-checkbox class="popupItem marginNone borderNone" v-for="(item) in showUserList" :key="item.id" v-model="item.isChecked" >
-                                    <span>{{item.name}}</span>
+                                    <span class="userNameClass_left">{{item.name}}</span>
+                                    <span class="userNameClass_right">{{ item.jobNumber }}</span>
                                 </van-checkbox>
                             </div>
                         </div>

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

@@ -114,8 +114,9 @@
                     </van-field>
                     <van-icon v-if="index != 0 && canEdit" class="delete_executor" name="delete-o" @click.stop="deleteExecutor(index)" />
                 </div>
-                <van-popup v-model="executor.show" position="bottom" v-if="canEdit">
-                    <van-search v-model="executor.searchText" placeholder="输入员工姓名搜索" @input="onSearch"></van-search>
+
+                <van-popup v-model="executor.show" position="bottom" v-if="canEdit" style="height: 90%">
+                    <!-- <van-search v-model="executor.searchText" placeholder="输入员工姓名搜索" @input="onSearch"></van-search>
                     <div style="minHeight:300px;">
                         <van-radio-group v-model="executor.item">
                             <van-radio v-for="uitem in executor.searchList" :key="uitem.id" :name="uitem" style="padding:10px">
@@ -125,8 +126,28 @@
                             </van-radio>
                         </van-radio-group>
                     <van-button style="width:100%;position: -webkit-sticky;position: sticky;bottom: 0;" @click="searchExecutor()">确定</van-button>
+                    </div> -->
+                    <div class="popupDiv">
+                        <div class="popupSearch" v-if="user.userNameNeedTranslate != '1'">
+                            <van-search v-model="executor.searchText" placeholder="输入员工姓名搜索" @search="onSearch" shape="round" background="#F4F4F4"></van-search>
+                        </div>
+
+                        <div class="popupCon conBorder">
+                            <van-radio-group v-model="executor.item" class="popupItem marginNone borderNone">
+                                <van-radio v-for="uitem in executor.searchList" :key="uitem.id" :name="uitem" style="padding:10px">
+                                    <span v-if="user.userNameNeedTranslate != 1" class="userNameClass_left">{{uitem.name}}</span>
+                                    <span v-else class="userNameClass_left"><ww-open-data type='userName' :openid='uitem.name'></ww-open-data></span>
+                                    <span class="userNameClass_right">{{ uitem.jobNumber }}</span>
+                                </van-radio>
+                            </van-radio-group>
+                        </div>
+
+                        <div class="popupBtn">
+                            <van-button style="width:100%;background: #1989fa;color: #ffffff;position: -webkit-sticky;position: sticky;bottom: 0;" round @click="searchExecutor()">确定</van-button>
+                        </div>
                     </div>
                 </van-popup>
+                
                 <!-- 添加执行人 -->
                 <div class="add_executor" @click="addExecutor" v-if="canEdit">添加执行人</div>
                 <!-- 优先级 -->