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

fhKeeper/formulahousekeeper/timesheet_h5/public/index.html

@@ -72,17 +72,20 @@
             flex: 2;
         }
         /* 清除浮动 */
-	.clearfix:after{
-		content: ""; 
-		display: block; 
-		height: 0; 
-		clear: both; 
-		visibility: hidden;  
-	}
-	.clearfix {
-		/* 触发 hasLayout */ 
-		zoom: 1; 
-	}
+        .clearfix:after{
+            content: ""; 
+            display: block; 
+            height: 0; 
+            clear: both; 
+            visibility: hidden;  
+        }
+        .clearfix {
+            /* 触发 hasLayout */ 
+            zoom: 1; 
+        }
+        .popupSearch .van-search__content {
+            background-color: #FFFFFF !important;
+        }
     </style>
 </head>
 

fhKeeper/formulahousekeeper/timesheet_h5/src/App.vue

@@ -41,5 +41,103 @@ export default {
 };
 </script>
 
+<style>
+  .popupDiv {
+    background: #F4F4F4;
+    position: relative;
+    height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+  .popupSearch {
+    width: 100%;
+  }
+  .popupCon {
+    width: 100%;
+    overflow: auto;
+    position: relative;
+  }
+  .paddingDiv {
+    box-sizing: border-box;
+    margin: 0 15px;
+  }
+  .popupTitle {
+    color: #333333;
+    padding: 0 30px;
+    position: relative;
+    line-height: 20px;
+  }
+  .popupTitle::after {
+    content: '';
+    width: 3px;
+    height: 100%;
+    border-radius: 3px;
+    background: #409eff;
+    position: absolute;
+    top: 0;
+    left: 15px;
+  }
+  .popupItem {
+    background: #FFFFFF;
+    padding: 10px 10px;
+    border-radius: 6px;
+    margin-top: 14px;
+    position: relative;
+  }
+  .marginTop {
+    margin-top: 15px;
+  }
+  .paddingTop {
+    padding-top: 10px;
+  }
+  .popupItem p {
+    width: 100%;
+    overflow: hidden;
+    white-space:nowrap;
+    text-overflow: ellipsis;
+    line-height: 22px;
+  }
+  .popupItemOne {
+    font-size: 15px;
+    color: #333;
+  }
+  .popupItemTwo {
+    font-size: 13px;
+    color: #999;
+    margin-top: 10px;
+  }
+  .popupItemIcon {
+    position: absolute;
+    right: 7px;
+    top: 50%;
+    font-size: 20px;
+    margin-top: -10px;
+    color: #999;
+  }
+
+  .popupConBox {
+    box-sizing: border-box;
+  }
+  .borderNone {
+    border-radius: 0;
+  }
+  .marginNone {
+    margin: 0 !important;
+  }
+  .popupBtn {
+    padding: 0 15px;
+    margin-top: 10px;
+    margin-bottom: 15px;
+  }
+  .conBorder {
+    width: auto !important;
+    margin: 0 15px;
+    border-radius: 10px;
+    box-sizing: border-box;
+  }
+  
+</style>
+
 
 

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

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="editClss">
         <van-nav-bar title="填写日报" left-text="返回" @click-left="back" fixed left-arrow/>
 
         <van-form class="login_form" ref="loginForm">
@@ -383,20 +383,41 @@
         <div class="form_tip" v-if="!canEdit && !canCancel"> 已审核无法修改 </div>
 
         <!-- 选择项目弹窗 -->
-        <van-popup v-model="showPickerUserddp" position="bottom" style="height: 80%">
-            <!-- <van-search v-model="userName" placeholder="输入项目名称搜索" @clear="sea()" @blur="sea()" @search="sea()"></van-search> -->
-            <van-search v-model="userName" placeholder="请输入项目名称/编号" @clear="sea()" @blur="sea()" @search="sea()" @input="sea()"/>
-            <div style="minHeight:300px;">
-                <div class="ryuan" style="color: rgb(185 185 185);">近期选择项目</div>
-                <div v-for="(item, index) in integrationProjectList" :key="index" class="ryuan" @click="fZr(item, index)">
-                    <p>{{item.projectName}}</p>
-                    <p style="margin-top: 5px;color: #9697B2;">{{item.projectCode}}</p> 
+        <van-popup v-model="showPickerUserddp" position="bottom" style="height: 84%">
+            <div class="popupDiv">
+                <!-- <van-search v-model="userName" placeholder="请输入项目名称/编号" @clear="sea()" @blur="sea()" @search="sea()" @input="sea()"/> -->
+                <div class="popupSearch">
+                    <van-search v-model="userName" shape="round" background="#F4F4F4" placeholder="请输入项目名称/编号" @clear="sea()" @blur="sea()" @search="sea()" @input="sea()"/>
                 </div>
+                
+                <div class="popupCon">
+                    <!-- <div class="ryuan" style="color: rgb(185 185 185);">近期选择项目</div>
+                    <div v-for="(item, index) in integrationProjectList" :key="index" class="ryuan" @click="fZr(item, index)">
+                        <p>{{item.projectName}}</p>
+                        <p style="margin-top: 5px;color: #9697B2;">{{item.projectCode}}</p> 
+                    </div>
+
+                    <div class="ryuan" style="color: rgb(185 185 185);">全部项目</div>
+                    <div v-for="(item, index) in projectss" :key="item.id" class="ryuan" @click="fZr(item, index)">
+                        <p>{{item.projectName}}</p>
+                        <p style="margin-top: 5px;color: #9697B2;">{{item.projectCode}}</p> 
+                    </div> -->
+
+                    <div class="popupTitle">近期选择项目</div>
+
+                    <div v-for="(item, index) in integrationProjectList" :key="index" class="popupItem paddingDiv" @click="fZr(item, index)">
+                        <p class="popupItemOne" v-if="item.projectName">{{item.projectName}}</p>
+                        <p class="popupItemTwo" v-if="item.projectCode">{{item.projectCode}}</p> 
+                    </div>
+
+                    <div class="popupTitle marginTop">全部项目</div>
+
+                    <div v-for="(item, index) in projectss" :key="item.id" class="popupItem paddingDiv" @click="fZr(item, index)">
+                        <p class="popupItemOne" v-if="item.projectName">{{item.projectName}}</p>
+                        <p class="popupItemTwo" v-if="item.projectCode">{{item.projectCode}}</p> 
+                    </div>
 
-                <div class="ryuan" style="color: rgb(185 185 185);">全部项目</div>
-                <div v-for="(item, index) in projectss" :key="item.id" class="ryuan" @click="fZr(item, index)">
-                    <p>{{item.projectName}}</p>
-                    <p style="margin-top: 5px;color: #9697B2;">{{item.projectCode}}</p> 
+                    <!-- <div class="popupTitle paddingDiv">全部项目</div> -->
                 </div>
             </div>
         </van-popup> 

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -345,12 +345,8 @@
 
         <!-- 选择项目弹窗 -->
         <van-popup v-model="showPickerUserddp" position="bottom" style="height: 80%">
-            <van-search v-model="userName" placeholder="请输入项目名称/编号" @clear="sea()" @blur="sea()" @search="sea()" @input="sea()"/>
+            <!-- <van-search v-model="userName" placeholder="请输入项目名称/编号" @clear="sea()" @blur="sea()" @search="sea()" @input="sea()"/>
             <div style="minHeight:300px;">
-                <!-- <div v-for="(item, index) in projectss" :key="item.id" class="ryuan" @click="fZr(item, index)">
-                    <p>{{item.projectName}}</p> 
-                    <p style="margin-top: 5px;color: #9697B2;">{{item.projectCode}}</p> 
-                </div> -->
 
                 <div class="ryuan" style="color: rgb(185 185 185);">近期选择项目</div>
                 <div v-for="(item, index) in integrationProjectList" :key="index" class="ryuan" @click="fZr(item, index)">
@@ -363,6 +359,27 @@
                     <p>{{item.projectName}}</p>
                     <p style="margin-top: 5px;color: #9697B2;">{{item.projectCode}}</p> 
                 </div>
+            </div> -->
+            <div class="popupDiv">
+                <div class="popupSearch">
+                    <van-search v-model="userName" shape="round" background="#F4F4F4" placeholder="请输入项目名称/编号" @clear="sea()" @blur="sea()" @search="sea()" @input="sea()"/>
+                </div>
+
+                <div class="popupCon">
+                    <div class="popupTitle">近期选择项目</div>
+
+                    <div v-for="(item, index) in integrationProjectList" :key="index" class="popupItem paddingDiv" @click="fZr(item, index)">
+                        <p class="popupItemOne" v-if="item.projectName">{{item.projectName}}</p>
+                        <p class="popupItemTwo" v-if="item.projectCode">{{item.projectCode}}</p> 
+                    </div>
+
+                    <div class="popupTitle marginTop">全部项目</div>
+
+                    <div v-for="(item, index) in projectss" :key="item.id" class="popupItem paddingDiv" @click="fZr(item, index)">
+                        <p class="popupItemOne" v-if="item.projectName">{{item.projectName}}</p>
+                        <p class="popupItemTwo" v-if="item.projectCode">{{item.projectCode}}</p> 
+                    </div>
+                </div>
             </div>
         </van-popup> 
     </div>

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

@@ -18,8 +18,8 @@
                             <span v-else>{{ formshowText.name }}</span>
                         </template>
                     </van-field>
-                    <van-popup v-model="ownerIdShow" position="bottom" v-if="canExamine">
-                        <div style="minHeight:300px;">
+                    <van-popup v-model="ownerIdShow" position="bottom" v-if="canExamine" style="height: 90%">
+                        <!-- <div style="minHeight:300px;">
                             <van-radio-group v-model="userRadio" v-if="user.userNameNeedTranslate == '1'">
                                 <van-radio v-for="item in userList" :key="item.id" :name="item" class="userCheckbox">
                                     <ww-open-data type='userName' :openid='item.name'></ww-open-data>
@@ -31,6 +31,23 @@
                             </van-radio-group>
                             <van-button style="width:100%;position: -webkit-sticky;position: sticky;bottom: 0;"
                                 @click="ownerIdChange()">确定</van-button>
+                        </div> -->
+                        <div class="popupDiv paddingTop">
+                            <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>
+                                    </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-group>
+                            </div>
+                            <div class="popupBtn">
+                                <van-button style="width:100%;background: #1989fa;color: #ffffff;" round
+                                @click="ownerIdChange()">确定</van-button>
+                            </div>
                         </div>
                     </van-popup>
                     <!-- 填报日期 -->

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

@@ -3,54 +3,45 @@
         <van-nav-bar title="项目管理" left-text="返回" @click-left="back" :right-text="projectAdd?'新增项目':''" @click-right="openDialog(-1)" fixed left-arrow/>
         
         <div class="login_form">
-            <!-- <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-                <van-list v-model="loading" :finished="finished" finished-text="没有更多了" :error.sync="error" error-text="请求失败，点击重新加载" @load="getProject">
-                    <van-swipe-cell v-for="(item,index) in list" :key="index">
-                        <van-cell :border="false" :title="item.projectName" :value="item.projectCode"/>
-                        <template slot="right" v-if="projectManagement || item.creatorId == user.id">
-                            <van-button square type="info" text="编辑" @click="openDialog(index)"/>
-                            <van-button square type="danger" text="删除" @click="delPro(index)"/>
-                        </template>
-                    </van-swipe-cell> 
-                </van-list>
-            </van-pull-refresh> -->
             <van-sticky offset-top="1.22667rem">
-            <van-cell>
-                <van-search
-                style="height:35px"
-                v-model="popoverValue"
-                show-action
-                :placeholder="'请输入' + (popoverType == '1' ? '项目名称' : '项目编号') + '关键词'"
-                @search="popoverSearch"
-                >
-                <template slot="left">
-                    <van-popover
-                    v-model="popoverShow"
-                    trigger="click"
-                    :actions="popoverActions"
-                    @select="popoverSelect"
-                    placement="bottom-start"
+            <!-- <van-cell> -->
+                <div class="popupSearch">
+                    <van-search
+                    v-model="popoverValue"
+                    show-action
+                    shape="round" background="#F4F4F4"
+                    :placeholder="'请输入' + (popoverType == '1' ? '项目名称' : '项目编号') + '关键词'"
+                    @search="popoverSearch"
                     >
-                    <template slot="reference">
-                        <span>{{popoverType == '1' ? '项目名称' : '项目编号'}}<van-icon name="arrow-down" size="10" style="margin-left:2px;" /></span>
+                    <template slot="left">
+                        <van-popover
+                        v-model="popoverShow"
+                        trigger="click"
+                        :actions="popoverActions"
+                        @select="popoverSelect"
+                        placement="bottom-start"
+                        >
+                        <template slot="reference">
+                            <span>{{popoverType == '1' ? '项目名称' : '项目编号'}}<van-icon name="arrow-down" size="10" style="margin-left:2px;" /></span>
+                        </template>
+                        </van-popover>
                     </template>
-                    </van-popover>
-                </template>
-                <template slot="action">
-                    <div @click="popoverSearch">搜索</div>
-                </template>
-                </van-search>
-            </van-cell>
+                    <template slot="action">
+                        <div @click="popoverSearch">搜索</div>
+                    </template>
+                    </van-search>
+                </div>
+            <!-- </van-cell> -->
             </van-sticky>
             <van-pull-refresh v-model="isDownLoading" @refresh="onDownRefresh">
                 <van-list v-model="isUpLoading" :finished="upFinished" :immediate-check="false" :offset="100" finished-text="没有更多了" @load="onLoadList">
-                    <van-swipe-cell v-for="(item,index) in list" :key="index">
+                    <!-- <van-swipe-cell v-for="(item,index) in list" :key="index">
                         <van-cell :border="false" :title="item.projectName" :value="item.projectCode" clickable @click="toProjectInside(item)"/>
-                        <!-- <template slot="right" v-if="projectManagement || item.creatorId == user.id">
-                            <van-button square type="info" text="编辑" @click="openDialog(index)" style="height:100%"/>
-                            <van-button square type="danger" text="删除" @click="delPro(index)" style="height:100%"/>
-                        </template> -->
-                    </van-swipe-cell> 
+                    </van-swipe-cell>  -->
+                    <div v-for="(item, index) in list" :key="index" class="popupItem paddingDiv" @click="toProjectInside(item)">
+                        <p class="popupItemOne" v-if="item.projectName" style="overflow: auto;white-space:normal;">{{item.projectName}}</p>
+                        <p class="popupItemTwo" v-if="item.projectCode" style="overflow: auto;white-space:normal;">{{item.projectCode}}</p> 
+                    </div>
                 </van-list>
             </van-pull-refresh>
 

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

@@ -24,8 +24,8 @@
                         <span v-else>{{userNameValue}}</span>
                     </template>
                 </van-cell>
-                <van-popup v-model="selectUserShow" position="bottom">
-                    <van-search v-model="searchInputValue" placeholder="输入员工姓名搜索" @search="userListSearch" v-if="user.userNameNeedTranslate != '1'"></van-search>
+                <van-popup v-model="selectUserShow" position="bottom" style="height: 90%">
+                    <!-- <van-search v-model="searchInputValue" placeholder="输入员工姓名搜索" @search="userListSearch" 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 showUserList" :key="item.id" v-model="item.isChecked" >
@@ -38,6 +38,28 @@
                             </van-checkbox>
                         </template>
                         <van-button style="width:100%;position: -webkit-sticky;position: sticky;bottom: 0;" @click="selectUserConfirm()">确定</van-button>
+                    </div> -->
+                    <div class="popupDiv">
+                        <div class="popupSearch" v-if="user.userNameNeedTranslate != '1'">
+                            <van-search v-model="searchInputValue" placeholder="输入员工姓名搜索" @search="userListSearch" 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 showUserList" :key="item.id" v-model="item.isChecked" >
+                                    <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                </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>
+                                </van-checkbox>
+                            </div>
+                        </div>
+
+                        <div class="popupBtn">
+                            <van-button style="width:100%;background: #1989fa;color: #ffffff;" round @click="selectUserConfirm()">确定</van-button>
+                        </div>
                     </div>
                 </van-popup>
             </van-sticky>