2022.4.9

.mini-ide/compileMode.json

@@ -11,7 +11,7 @@
     {
       "title": "绩效考核",
       "page": "pages/home/performanceDetails/performanceDetails",
-      "pageQuery": "id=888"
+      "pageQuery": "id=542"
     },
     {
       "title": "编辑管理记录",
@@ -49,6 +49,10 @@
       "title": "结果值录入",
       "page": "pages/home/resultValueEntry/resultValueEntry",
       "pageQuery": "id=116"
+    },
+    {
+      "title": "领导也",
+      "page": "pages/index/start/start"
     }
   ]
 }

Component/selectEnevt/selectEnevt.js

@@ -50,7 +50,7 @@ Component({
     },
     //获取事件列表
     getlist(is) {
-      app.$get('api/integral/statistics/integral', {page:that.data.page, keyword:that.data.keyVal, page_size: 20}).then((res) => {
+      app.$get2('api/integral/statistics/integral', {page:that.data.page, keyword:that.data.keyVal, page_size: 20}).then((res) => {
         var data = res.data.data.list;
         data.map((item) => {
           item.ptObj = app.getTypesItem(item.pt_id);

Component/selectRule_two/selectRule_two.js

@@ -71,7 +71,7 @@ Component({
       })
     },
     getData() {
-      app.$get("api/integral/rule/trees", { pt_id: 3,cycle_type: 1 }).then((res) => {
+      app.$get2("api/integral/rule/trees", { pt_id: 3,cycle_type: 1 }).then((res) => {
         var rule_tree = res.data.data.rule_tree;
         rule_tree.unshift({
           name:'全部分类',

Component/selectSection/selectSection.js

@@ -83,7 +83,7 @@ Component({
     },
     //获取部门列表
     getBmData() {
-      app.$get("api/per/user/department", {}).then((res) => {
+      app.$get2("api/per/user/department", {}).then((res) => {
         var list = res.data.data.dept_tree||[];
         list.unshift({
           name:'全公司',

Component/selectSectionBottom/selectSectionBottom.js

@@ -121,7 +121,7 @@ Component({
     },
     //获取部门列表
     getBmData() {
-      app.$get("api/department/tree", {}).then((res) => {
+      app.$get2("api/department/tree", {}).then((res) => {
         var list = res.data.data.list || [];
         var defaultSection = that.props.defaultSection;
         list.map((item) => { //设置列表的选中状态

Component/selectSectionStaff/selectSectionStaff.js

@@ -239,7 +239,7 @@ Component({
         userList: [],
         all_user_list: []
       })
-      app.$get("api/per/user/employee_list", { dept_id: dept_id,page:0,pageSize:0 }).then((res) => {
+      app.$get2("api/per/user/employee_list", { dept_id: dept_id,page:0,pageSize:0,official:1,scope:1 }).then((res) => {
         var list = res.data.data.list || [];
         var selectUserId = this.data.selectUserId;
         var arr = [];

Component/selectSectionStaff_tow/selectSectionStaff_tow.js

@@ -158,7 +158,7 @@ Component({
     //获取人员列表
     getData(dept_id) {
       this.setData({ userList: [], all_user_list: [] })
-      app.$get("api/per/user/employee_list", { dept_id: dept_id,page:0,pageSize:0  }).then((res) => {
+      app.$get2("api/per/user/employee_list", { dept_id: dept_id,page:0,pageSize:0,official:1,scope:1  }).then((res) => {
         var list = res.data.data.list;
         var selectUserId = this.data.selectUserId;
         var arr = [];

Component/selectStaff/selectStaff.js

@@ -86,7 +86,7 @@ Component({
       })
     },
     getData() {
-      app.$get("api/per/user/employee_list", { page:0,pageSize:0 }).then((res) => {
+      app.$get2("api/per/user/employee_list", { page:0,pageSize:0 }).then((res) => {
         var list = res.data.data.list;
         var arr = this.props.defaultUser;
         if (typeof (arr) == 'string') {

Component/selectSx/selectSx.acss

@@ -14,7 +14,7 @@
   padding-top: 28rpx;
   margin-top: 0rpx;
   transform: translateY(-100%);
-    position: fixed;
+  position: fixed;
   left: 0;
   right: 0;
   z-index: 8;

Component/selectType/selectType.js

@@ -93,7 +93,7 @@ Component({
       if (that.props.isGzType) {
         pt_id = app.getTypesItem(that.props.isGzType).id;
       }
-      app.$get("api/integral/rule/trees", { pt_id: pt_id,cycle_type: 1 }).then((res) => {
+      app.$get2("api/integral/rule/trees", { pt_id: pt_id,cycle_type: 1 }).then((res) => {
         var rule_tree = res.data.data.rule_tree
         if (this.props.defaultId) {
           rule_tree.map(item => {

Component/selectUser/selectUser.js

@@ -48,7 +48,7 @@ Component({
       }
     },
     getData(keywords) {
-      app.$get("api/employee/list", { dept_id: 0, keywords: keywords }).then((res) => {
+      app.$get2("api/employee/list", { dept_id: 0, keywords: keywords }).then((res) => {
         this.setData({
           userList: res.data.data.list,
           all_user_list: res.data.data.list

app.acss

@@ -56,7 +56,6 @@
 	}
 
 	/* 搜索框 */
-
 	.search {
 		background-color: #f7f8fa;
 		border-radius: 10rpx;

app.json

@@ -20,10 +20,11 @@
     "pages/home/resultValueEntry/resultValueEntry",
     "pages/serve/serve/serve",
     "pages/serve/webView/webView",
+    "pages/serve/addMoney/addMoney",
     "pages/index/noPage/noPage"
   ],
   "window": {
-    "defaultTitle": "功道云",
+    "defaultTitle": "功道云绩效",
     "pullRefresh": false,
     "allowsBounceVertical": "NO"
   },

pages/home/actionplanDetails/actionplanDetails.acss

@@ -16,12 +16,15 @@
    background-color: #fff;
   border-bottom: 0.02rem solid #ebedf0;
 }
-/* .icon{
+.blue{
+  width: 6rem;
+}
+.icon{
   right: 0.3rem;
   top: 0.22rem;
   position: absolute;
   z-index: 9999;
-} */
+}
   .pullUpdel {
     margin: 0.15rem 0 6rem 0;
     padding: 0.25rem;

pages/home/actionplanDetails/actionplanDetails.axml

@@ -34,7 +34,7 @@
         <button size="mini" type="primary" catchTap="openImg" style="margin-bottom:20rpx">+附件</button>
         <!--<view class="van-uploader__upload" catchTap="openImg"><text class="iconfont icon-xiangji" style="color:#dcdee0;font-size:0.46rem;"></text></view> -->
         <view class="images flex-box-ce" a:for="{{append}}" a:key="{{index}}">
-          <view class="flex-1 blue" catchTap="showImg" data-item="{{item}}">{{item.fileName}}</view>
+          <view class="blue font-flex-word" catchTap="showImg" data-item="{{item}}">{{item.fileName}}</view>
           <view catchTap="deleteImg" data-index="{{index}}" style="padding:14rpx 20rpx">
             <icon type="clear" size="16" />
           </view>
@@ -49,17 +49,17 @@
         </view>
         <view class="apdData {{apdList.length == index + 1? 'apdborderNO':''}}">
           <view>
-            <view style="font-size:.3rem;color:block;font-weight: 600;margin-top:0.1rem">{{ item.title }}</view>
-            <view style="font-size:.24rem;color:#b7b7b7;padding:0.15rem 0">{{ item.date }} 更新
-              <text style="padding-left:10rxp">记录人{{item.userName}}</text></view>
-            <view style="font-size:.25rem;color:#505050;">
-              {{item.remark}}
-            </view>
+            <text style="font-size:.3rem;color:block;font-weight: 600;margin-top:0.1rem">{{ item.title }}</text>
+            <view style="font-size:.24rem;color:#b7b7b7;padding:0.15rem 0">{{ item.date }}更新 
+                <text style="padding-left:10rpx" a:if="{{item.userName}}">  记录人:{{item.userName}}</text></view>
+              <text style="font-size:.25rem;color:#505050;">
+                {{item.remark}}
+              </text>
           </view>
           
           <block a:if="{{item.append}}">
             <view class="images flex-box-ce" a:for="{{item.append}}" a:for-item="e" style="margin-top:16rpx">
-              <view class="flex-1 blue" catchTap="showImg" data-item="{{e}}">{{e.fileName}}</view>
+              <view class="flex-1 font-flex-word blue" catchTap="showImg" data-item="{{e}}">{{e.fileName}}</view>
             </view>
             <!--<view class="flex-box-ce" style="margin: 10px 0;" a:if="{{item.images.length>0}}"><image a:for="{{item.images}}" a:for-item="e" onTap="showImg" data-img="{{e}}" style="border-radius: 3px;margin-right: 10px;width:200rpx;height:200rpx" 
                 src="{{e.url}}" /></view> -->

pages/home/actionplanDetails/actionplanDetails.js

@@ -34,9 +34,6 @@ Page({
     this.setData({
       query: getCache('actionplanDetails')
     })
-    this.setData({
-      append: [],
-    })
     this.init()
   },
   showDetil() {
@@ -56,8 +53,10 @@ Page({
       })
       return false
     }
+    let append = this.data.append;
+    append.splice(e.target.dataset.index, 1)
     this.setData({
-      append: this.data.append.splice(e.target.dataset.index-1, 1)
+      append: append
     })
   },
   // 返回时刷新列表数据
@@ -106,8 +105,7 @@ Page({
     this.setData({
       bootBool: true
     })
-    app.$post(urls, data)
-      .then(res => {
+    app.$post(urls, data).then(res => {
         if (res.data.code == 1) {
           app.globalData.showToast('提交成功');
           this.setData({
@@ -117,12 +115,12 @@ Page({
           })
           this.employeeDet();
         }
-        setTimeout(() => {
-          this.setData({
-            bootBool: false
-          })
-        }, 1000);
+    })
+    setTimeout(() => {
+      this.setData({
+        bootBool: false
       })
+    }, 1000);
   },
   closeWt() {
     localStorage.setItem('isWt', true);
@@ -206,7 +204,9 @@ Page({
       assessID: query.assessID,
       planIndex: apList.planIndex,
       apDetails: apList,
+      append:this.data.append.length>0? this.data.append:[],
     })
+
     if (this.data.knowFrom == 'action') {
       if (this.data.assessID == app.globalData.userData.id) {
         this.setData({
@@ -221,6 +221,7 @@ Page({
       this.setData({//管理记录人判断
         isShowAdd: apList.isOperation
       })
+      this.getSuperior(query.assessID);
       // this.$getEmployeeAll()[this.assessID].employee_detail.superior_list.some(item => {
       //   // 判断被考核人的上级是否包含登录者
       //   if (item.id == this.$getUserData_jx().id) {
@@ -244,14 +245,29 @@ Page({
         detailsTIt: '管理记录'
       })
     }
+
     this.employeeDet();
   },
+  // 判断是否当前被考核人的上级
+  getSuperior(id) {
+    app.$get('api/per/user/manager_list', { id_code: app.returnCode(id) }).then(res => {
+      let superiorList = res.data.data; //被考核人上级
+      superiorList.some(item => {
+        if (item.id == app.globalData.userData.id) {
+          this.setData({
+            isShowAdd: true
+          })
+          return true
+        }
+      })
+    });
+  },
   showImg(e) {
     let item = e.target.dataset.item
-    app.$get('api/drive/grant',{file_id:item.fileId}).then(res => {
+    app.$get('api/drive/grant', { file_id: item.fileId }).then(res => {
       dd.previewFileInDingTalk({
         corpId: app.globalData.corpId,
-        spaceId:item.spaceId,
+        spaceId: item.spaceId,
         fileId: item.fileId,
         fileName: item.fileName,
         fileSize: item.fileSize,
@@ -281,7 +297,7 @@ Page({
   openImg(e) {
     let append = this.data.append;
     app.$get('api/drive/info').then(res => {
-      let spaceId = res.data.data.space_id
+      let spaceId = res.data.data.space_id.toString()
       dd.uploadAttachmentToDingTalk({
         image: { multiple: true, compress: false, max: 5, spaceId: spaceId },
         space: { spaceId: spaceId, isCopy: 1, max: 5 },
@@ -294,7 +310,7 @@ Page({
           })
         },
         fail: (err) => {
-
+          console.log(err)
         }
       })
     })

pages/home/addthePlan/addthePlan.acss

@@ -112,11 +112,13 @@
 }
 .footer{
   position: fixed;
-  bottom: 0.24rem;
-  left: 0.24rem;
-  right: 0.24rem;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  padding: 0.24rem;
   text-align: center;
   font-size: 0.32rem;
+  background-color: #fff;
 }
 .btns view:nth-child(1){
   width: 1.6rem;

pages/home/addthePlan/addthePlan.axml

@@ -46,7 +46,7 @@
       <button size="mini" type="primary" catchTap="openImg" style="margin-bottom:20rpx">+附件</button>
       <!--<view class="van-uploader__upload" catchTap="openImg"><text class="iconfont icon-xiangji" style="color:#dcdee0;font-size:0.46rem;"></text></view> -->
       <view class="images flex-box-ce" a:for="{{append}}" a:key="{{index}}">
-        <view class="flex-1 blue" catchTap="showImg" data-item="{{item}}">{{item.fileName}}</view>
+        <view class="flex-1 font-flex-word blue" catchTap="showImg" data-item="{{item}}">{{item.fileName}}</view>
         <view catchTap="deleteImg" data-index="{{index}}" style="padding:14rpx 20rpx">
           <icon type="clear" size="16" />
         </view>

pages/home/addthePlan/addthePlan.js

@@ -159,18 +159,17 @@ Page({
     this.setData({
       bootBool: true
     })
-    app.$post(urls, data)
-      .then(res => {
+    app.$post(urls, data).then(res => {
         if (res.data.code == 1) {
           app.globalData.showToast('提交成功');
           this.routerBak();
         }
-		setTimeout(() => {
-		  this.setData({
-		    bootBool: false
-		  })
-		}, 1000);
-      })
+    })
+    setTimeout(() => {
+        this.setData({
+          bootBool: false
+        })
+    }, 1000);
   },
   bindTextAreaBlur: function (e) {
     this.setData({
@@ -189,8 +188,10 @@ Page({
       })
       return false
     }
+    let append = this.data.append;
+    append.splice(e.target.dataset.index, 1)
     this.setData({
-      append: this.data.append.splice(e.target.dataset.index-1, 1)
+      append: append
     })
   },
   init() {
@@ -205,7 +206,7 @@ Page({
         arrlist: true,
         titValue: this.data.keyszb.title,
         messageVal: this.data.keyszb.remark,
-        append: this.data.keyszb.append,
+        append:this.data.append.length>0? this.data.append:this.data.keyszb.append,
       })
     } else {
       this.setData({
@@ -234,6 +235,7 @@ Page({
       this.setData({
         isShowAdd: apList.isOperation, //管理记录人判断
       })
+      this.getSuperior(rout.assessID)
       // this.$getEmployeeAll()[this.assessID].employee_detail.superior_list.some(item => {
       //   // 判断被考核人的上级是否包含登录者
       //   if (item.id == this.$getUserData_jx().id) {
@@ -258,6 +260,20 @@ Page({
         detailsTIt: '管理记录',
       })
     }
+  },
+    // 判断是否当前被考核人的上级
+  getSuperior(id) {
+    app.$get('api/per/user/manager_list', { id_code: app.returnCode(id) }).then(res => {
+      let superiorList = res.data.data; //被考核人上级
+      superiorList.some(item => {
+        if (item.id == app.globalData.userData.id) {
+          this.setData({
+            isShowAdd: true
+          })
+          return true
+        }
+      })
+    });
   },
   //图片选择
   openImg(e) {
@@ -270,13 +286,14 @@ Page({
         file: { spaceId: spaceId, max: 5 },
         types: ["photo", "file", "space"],//PC端仅支持["photo","file","space"]
         success: (res) => {
+          console.log(res);
           append.push(...res.data);
           that.setData({
             append: append
           })
         },
         fail: (err) => {
-
+          console.log(err);
         }
       })
     })

pages/home/allJx/allJx.js

@@ -16,13 +16,16 @@ Page({
       { value: 1, label: '天' },
       { value: 6, label: '自定义' }
     ],
+    page:1,
   },
   onLoad() {
     that = this;
     dd.setNavigationBar({ title: "全部考核" });
   },
   onShow(){
-    this.getList();
+    if(this.data.page==1){
+      this.getList();
+    }
   },
   getList(is) {
     if (!is) { this.setData({ page: 1 })};

pages/home/backlog/backlog.acss

@@ -20,4 +20,5 @@
 }
 .center{
   padding: 0 10rpx;
+  line-height: 40rpx;
 }

pages/home/backlog/backlog.js

@@ -18,7 +18,7 @@ Page({
   },
   onLoad() {
     that = this;
-    dd.setNavigationBar({ title: "代办事项" });
+    dd.setNavigationBar({ title: "待办事项" });
   },
   onShow() {
     if (this.data.page == 1) {

pages/home/home/home.acss

@@ -1,3 +1,46 @@
+
+.logo{
+  text-align: center;
+  margin: 0.24rem 0;
+}
+.logo image{
+  width: 88rpx;
+  height: 88rpx;
+}
+.qxText{
+  padding: 28rpx;
+  padding-bottom: 48rpx;
+  font-size: 24rpx;
+}
+.windows-box{
+  background: #fff;
+  margin: 0 32rpx;
+  margin-top: 40%;
+  border-radius: 20rpx; 
+}
+.windows-title{
+  text-align: center;
+  padding: 28rpx 0;
+  border-bottom: 1px solid #f1f1f1;
+}
+.windows-btn{
+   border-top: 1px solid #f1f1f1;
+}
+.windows-btn view:nth-child(1){
+  text-align: center;
+  padding: 28rpx 0;
+  border-right: 1px solid #f1f1f1;
+}
+.windows-btn button{
+  text-align: center;
+  color: #26A2FF;
+  background: #fff;
+  border: none;
+}
+.windows-content textarea{
+  height: 150rpx;
+  padding: 28rpx;
+}
 .top-img{
   width: 100%;
 }
@@ -100,14 +143,23 @@
 .menuList{
   /* padding: 0 28rpx; */
 }
+.closes{
+  position:absolute;
+  right: 0rpx;
+  font-size: 28rpx;
+  padding:0 0.2rem;
+  top: 0;
+  bottom: 0;
+}
 .flex_one {
+    position: relative;
     height: 0.76rem;
     font-size: 0.29rem;
     border-radius: 0.02rem;
-    background-color: #fff;
+    background-color: #26a2ff;
     box-sizing: border-box;
     border: 2rpx solid #26a2ff;
-    color: #26a2ff;
+    color: #fff;
     -webkit-box-align: center;
     -webkit-align-items: center;
     align-items: center;
@@ -144,7 +196,7 @@
 .item{
   background-color: #fff;
   border-bottom: 1px solid #f1f1f1;
-  padding:0.24rem 0.32rem;
+  padding:0.3rem 0.32rem;
   font-size: 0.29rem;
   padding-left: 0.46rem;
   position: relative;

pages/home/home/home.axml

@@ -15,7 +15,7 @@
           defaultText="默认文本"
           onError="openDataError"
           class="open-data-test"
-      /> -->
+       /> -->
         <img-box name="{{userInfo.name}}" imgUrl="{{userInfo.img_url}}" height="90rpx" width="90rpx" fSize="28rpx"></img-box>
       </view>
       <view class="flex-1">
@@ -35,7 +35,7 @@
         <view>{{item.name}}</view>
       </view>
     </view>
-    <view class="flex_one">两分钟了解功道云绩效</view>
+    <view class="flex_one" catchTap="openWebView" a:if="{{isClose}}" >两分钟了解功道云绩效<text class="iconfont icon-dianji" style="padding-left:10rpx;font-size:28rpx"></text><text class="closes" catchTap="closes">×</text> </view>
   </view>
   <view class="flex-box-ce que margin-bottom" style="font-size: 0.28rem;">
     <view class="{{tabIndex==1? 'tabs':''}} flex-1" onTap="tabAction" data-index="1">待办事项 <text class="red" style="padding-left:10rpx">({{dbTolal}})</text></view>
@@ -55,7 +55,7 @@
       </text>
     </view>
      <no-data a:if="{{dbList.length==0}}"></no-data>
-    <view class="rankingLists" a:if="{{dbTolal>1}}" onTap="openAll" data-index="1">查看全部代办<text class="iconfont icon-jiantouyou" style="font-size:20rpx;margin-left:6rpx;position: relative;top:-3rpx"></text></view>
+    <view class="rankingLists" a:if="{{dbTolal>1}}" onTap="openAll" data-index="1">查看全部待办<text class="iconfont icon-jiantouyou" style="font-size:20rpx;margin-left:6rpx;position: relative;top:-3rpx"></text></view>
   </view>
   <view class="list" a:else>
     <view class="item flex-box-ce" a:for="{{xxList}}" onTap="openDetail" data-item="{{item}}">
@@ -63,4 +63,21 @@
     </view>
     <view class="rankingLists" onTap="openAll" data-index="2">查看全部消息<text class="iconfont icon-jiantouyou" style="font-size:20rpx;margin-left:6rpx;position: relative;top:-3rpx"></text></view>
   </view>
+  <!-- 权限勾选 -->
+  <view class="windows" a:if="{{isPoint}}">
+    <view class="windows-box">
+      <view class="windows-title">个人信息权限申请</view>
+      <view class="windows-content">
+        <view class="logo"><image class="top-img" mode="widthFix" src="../../../image/logo.png" /></view>
+        <view style="padding:0 28rpx;">功道云绩效申请获取以下权限：</view>
+        <view class="fontColorX qxText">获取你的公开信息（呢称，头像等）</view>
+      </view>
+      <view class="windows-btn flex-box flex-v-ce">
+        <view class="flex-1" catchTap="closes2">拒绝</view>
+        <button type="default" class="flex-1"catchTap="closes2">允许</button>
+      </view>
+    </view>
+  </view>
+
+
 </view>

pages/home/home/home.js

@@ -1,6 +1,6 @@
 var app = getApp();
 var that;
-import { _debounce, getCache } from '../../../utils/util'
+import { _debounce, getCache,setCache } from '../../../utils/util'
 import 'dingtalk-jsapi/entry/union';
 import { contactAdminToUseApp } from 'dingtalk-design-libs';
 Page({
@@ -22,13 +22,17 @@ Page({
     mainCorpId: '',//如果是个人版，这个企业ID是登录者所在的企业ID，不是钉钉那边提供的隐藏企业ID
     errorInfo:'',
     openDataAvailable: dd.canIUse('open-data'),
+    isClose:true,
+    isPoint:true,
   },
   onLoad() {
     that = this;
     dd.setNavigationBar({ title: "首页" });
     that.setData({
       userInfo: app.globalData.userData,
-      role: getCache('role')
+      role: getCache('role'),
+      isPoint: getCache('isPoint')? false:true,
+      isClose:getCache('isClose')? false:true
     })
     this.setR();
     this.returnS();
@@ -37,12 +41,27 @@ Page({
   onShow() {
     this.getDb()
   },
+  openWebView(e) {
+    dd.navigateTo({
+      url: '../../serve/webView/webView?index='+5
+    })
+  },
+  closes(){
+      that.setData({
+        isClose:false,
+      })
+      // setCache('isClose',true);
+  },
+  closes2(){
+      that.setData({
+        isPoint:false,
+      })
+      setCache('isPoint',true);
+  },
   openDataError(err) {
-    console.log(err);
     this.setData({
       errorInfo: JSON.stringify(err)
     });
-    // switch err.code
   },
   openGly() {
     contactAdminToUseApp({ id: '107002', corpId: that.data.mainCorpId })
@@ -82,6 +101,9 @@ Page({
       let list = res.data.data.list
       let data = {}
       for (let i in list) {
+        if (list[i].is_scope === 0||list[i].is_official ===0) {
+					list[i].name = list[i].name + '(未启用)';
+				}
         data[list[i].id] = list[i];
       }
       app.globalData.usersList = data;

pages/home/myJx/myJx.acss

@@ -1,9 +1,9 @@
 .item{
   background-color: #fff;
   padding: 0.24rem 0.32rem;
-  margin-bottom: 0.1rem;
+  margin-top: 0.1rem;
   box-shadow: 0 0.05rem 0.15rem 0.01rem #efefef;
-  border-top: 0.02rem solid #f0f0f0;
+  /* border-top: 0.02rem solid #f0f0f0; */
   font-size: 0.28rem;
 }
 .me_list_col {

pages/home/myJx/myJx.axml

@@ -1,5 +1,6 @@
 <view>
   <scroll-view style="header:100vh" scroll-y="{{true}}" a:if="{{list.length>0}}">
+    <view style="height:0.1rem"></view>
     <view a:for="{{list}}" class="flex-box-ce item" onTap="openDetail" data-item="{{item}}">
       <img-box height="70rpx" width="70rpx" fSize="24rpx" name="{{item.employee_name}}" id="{{item.employee_id}}"></img-box>
       <view class="flex-1" style="margin-left:0.2rem">

pages/home/participation/participation.axml

@@ -1,70 +1,72 @@
 <view>
-  <view class="flex-box-ce header margin-bottom">
-    <view class="{{tabIndex==1? 'tabs':''}} flex-1" onTap="tabAction" data-index="1">我参与管理</view>
-    <view class="{{tabIndex==2? 'tabs':''}} flex-1" onTap="tabAction" data-index="2">我参与评分</view>
-  </view>
-  <view class="main margin-bottom">
-    <view class="flex-box-ce">
-      <view class="flex-2 flex-box-ce flex-center-center font-flex-word" catchTap="openSelect">
-        <text class="text font-flex-word">{{jxName}}</text>
-        <text class="iconfont icon-jiantouxia"></text>
-      </view>
-      <view class="flex-1 flex-box-ce flex-center-center">
-        <picker onChange="activeItem" value="{{minuteIndex}}" range="{{minuteArray}}" range-key="name">
-          <text class="text font-flex-word">{{minuteArray[minuteIndex].name}}</text>
-        </picker>
-        <text class="iconfont icon-jiantouxia"></text>
-      </view>
+  <block a:if="{{defaultRuleId}}">
+    <view class="flex-box-ce header margin-bottom">
+      <view class="{{tabIndex==1? 'tabs':''}} flex-1" onTap="tabAction" data-index="1">我参与管理</view>
+      <view class="{{tabIndex==2? 'tabs':''}} flex-1" onTap="tabAction" data-index="2">我参与评分</view>
     </view>
-    <form onReset="onReset">
-      <view class="search flex-box-ce">
-        <image mode="widthFix" src="../../../image/ss.png" />
-        <input placeholder="请输入姓名" onInput="bindKeyInput" onConfirm="bindKeyInput" class="flex-1" />
-        <button a:if="{{isVal}}" class="delVal" formType="reset">×</button>
-      </view>
-    </form>
-    <view style="height:0.22rem"></view>
-  </view>
-  <scroll-view class="scroll" style="height: calc(100vh - 3rem)" a:if="{{list.length>0}}" scroll-y="{{true}}" onScrollToLower="onScrollToLower">
-    <view class="flex-box-ce li border-bottom flex-d-wrap" data-item="{{item}}" catchTap="openDetail" a:for="{{list}}">
-      <img-box id="{{item.userInfo.id}}" name="{{item.userInfo.name}}" height="80rpx" width="80rpx" fSize="24rpx"></img-box>
-      <view class="flex-1" style="margin:0 0.2rem;">
-        <view class="name flex-1">{{item.userInfo.name}}</view>
-        <view class="fontColorX font-flex-word" style="font-size: 0.28rem;width: 3.5rem;" a:if="{{item.dept_list.length>0}}">
-          <text a:for="{{item.dept_list}}" a:for-item="item2" a:for-index="index2">{{ item2.name }}<text a:if="{{item.dept_list.length - index2 > 1}}">,</text></text>
+    <view class="main margin-bottom">
+      <view class="flex-box-ce">
+        <view class="flex-2 flex-box-ce flex-center-center font-flex-word" catchTap="openSelect">
+          <text class="text font-flex-word">{{jxName}}</text>
+          <text class="iconfont icon-jiantouxia"></text>
+        </view>
+        <view class="flex-1 flex-box-ce flex-center-center">
+          <picker onChange="activeItem" value="{{minuteIndex}}" range="{{minuteArray}}" range-key="name">
+            <text class="text font-flex-word">{{minuteArray[minuteIndex].name}}</text>
+          </picker>
+          <text class="iconfont icon-jiantouxia"></text>
         </view>
       </view>
-      <view class="main-right">
-        <block a:if="{{tabIndex==1}}">
-          <text class="green" a:if="{{item.count_record}}">{{item.count_record}}条管理记录</text>
-          <text class="fontColorX" a:else>无管理记录</text>
-        </block>
-        <block a:else>
-          <text a:if="{{item.status==0}}" class="yellow">未到评分节点</text>
-          <text a:if="{{item.status==1}}" class="blue">待我评分</text>
-          <text a:if="{{item.status==2}}" class="orange">我已评分</text>
-          <text a:if="{{item.status==3}}" class="orange">已被其他管理评分</text>
-        </block>
-        <view class="flex-box flex-v-ce" style="margin-top:0.1rem">
+      <form onReset="onReset">
+        <view class="search flex-box-ce">
+          <image mode="widthFix" src="../../../image/ss.png" />
+          <input placeholder="请输入姓名" onInput="bindKeyInput" onConfirm="bindKeyInput" class="flex-1" />
+          <button a:if="{{isVal}}" class="delVal" formType="reset">×</button>
+        </view>
+      </form>
+      <view style="height:0.22rem"></view>
+    </view>
+    <scroll-view class="scroll" style="height: calc(100vh - 3rem)" a:if="{{list.length>0}}" scroll-y="{{true}}" onScrollToLower="onScrollToLower">
+      <view class="flex-box-ce li border-bottom flex-d-wrap" data-item="{{item}}" catchTap="openDetail" a:for="{{list}}">
+        <img-box id="{{item.userInfo.id}}" name="{{item.userInfo.name}}" height="80rpx" width="80rpx" fSize="24rpx"></img-box>
+        <view class="flex-1" style="margin:0 0.2rem;">
+          <view class="name flex-1">{{item.userInfo.name}}</view>
+          <view class="fontColorX font-flex-word" style="font-size: 0.28rem;width: 3.5rem;" a:if="{{item.dept_list.length>0}}">
+            <text a:for="{{item.dept_list}}" a:for-item="item2" a:for-index="index2">{{ item2.name }}<text a:if="{{item.dept_list.length - index2 > 1}}">,</text></text>
+          </view>
+        </view>
+        <view class="main-right">
           <block a:if="{{tabIndex==1}}">
-            <view a:if="{{!item.has_finish}}" class="blueBtn">填写管理记录</view>
-            <text a:else class="orange">已归档</text>
+            <text class="green" a:if="{{item.count_record}}">{{item.count_record}}条管理记录</text>
+            <text class="fontColorX" a:else>无管理记录</text>
+          </block>
+          <block a:else>
+            <text a:if="{{item.status==0}}" class="yellow">未到评分节点</text>
+            <text a:if="{{item.status==1}}" class="blue">待我评分</text>
+            <text a:if="{{item.status==2}}" class="orange">我已评分</text>
+            <text a:if="{{item.status==3}}" class="orange">已被其他管理评分</text>
+          </block>
+          <view class="flex-box flex-v-ce" style="margin-top:0.1rem">
+            <block a:if="{{tabIndex==1}}">
+              <view a:if="{{!item.has_finish}}" class="blueBtn">填写管理记录</view>
+              <text a:else class="orange">已归档</text>
+            </block>
+            <view class="blueBtn" a:else>查看详情</view>
+          </view>
+        </view>
+        <view style="width: 100%;" a:if="{{tabIndex==1}}">
+          <block a:if="{{item.returnStr}}">
+            <view a:if="{{item.returnStr.indexOf('今天')>=0}}" class="orange" style="font-size: 0.28rem;padding-left:1rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
+            <view a:elif="{{item.returnStr.indexOf('昨天')>=0}}" class="green" style="font-size: 0.28rem;padding-left:1rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
+            <view a:elif="{{item.returnStr.indexOf('前天')>=0}}" style="font-size: 0.28rem;padding-left:1rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
+            <view a:else style="font-size: 0.28rem;padding-left:1rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
           </block>
-          <view class="blueBtn" a:else>查看详情</view>
         </view>
       </view>
-      <view style="width: 100%;" a:if="{{tabIndex==1}}">
-        <block a:if="{{item.returnStr}}">
-          <view a:if="{{item.returnStr.indexOf('今天')>=0}}" class="orange" style="font-size: 0.28rem;padding-left:1rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
-          <view a:elif="{{item.returnStr.indexOf('昨天')>=0}}" class="green" style="font-size: 0.28rem;padding-left:1rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
-          <view a:elif="{{item.returnStr.indexOf('前天')>=0}}" style="font-size: 0.28rem;padding-left:1rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
-          <view a:else style="font-size: 0.28rem;padding-left:1rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
-        </block>
-      </view>
-    </view>
-    <view class="noDatas" a:if="{{isData}}">没有更多咯</view>
-  </scroll-view>
-  <no-data a:if="{{list.length==0}}"></no-data>
+      <view class="noDatas" a:if="{{isData}}">没有更多了</view>
+    </scroll-view>
+  </block>
+  <no-data a:if="{{list.length==0}}" content="暂无考核内容"></no-data>
   <view class="box" animation="{{animationInfo}}">
     <select-jx defaultId="{{defaultRuleId}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType}}" />
   </view>

pages/home/participation/participation.js

@@ -9,7 +9,7 @@ Page({
     minuteIndex: 0,//条件选择
     minuteArray: [
       { value: 0, name: '全部' },
-      { value: 1, name: '我的下级' },
+      { value: 1, name: '我的团队' },
       { value: 2, name: '我协助的' },
     ],
     selectGlData: {}, // 当前选中项
@@ -82,6 +82,9 @@ Page({
     if (!e) {
       this.setData({ page: 1 })
     }
+    if (!this.data.defaultRuleId) {
+     return false
+    }
     let range = this.data.minuteArray[this.data.minuteIndex].value;
     this.setData({ list: [] })
     app.$get('api/per/package/management_record', { package_id: this.data.defaultRuleId, range: range, name: this.data.keyword, page: this.data.page, page_size: 20 }).then(res => {
@@ -181,8 +184,8 @@ Page({
         }
       });
       that.setData({
-        defaultRuleId: obj[0].id,
-        jxName: obj[0].name,
+        defaultRuleId:obj? obj[0].id:'',
+        jxName:obj? obj[0].name:'',
       })
       this.getManagement();
     })

pages/home/performanceDetails/performanceDetails.acss

@@ -7,6 +7,18 @@
   position: sticky;
   top: 0;
  } 
+ .textBox {
+    border-radius: 0;
+    background: rgba(48,49,51,.1);
+    color: #8a8a8a;
+    font-size: 0.24rem;
+    padding:0.05rem 0.1rem;
+}
+ .backCol{
+   background-color: #f1f1f1;
+   border-radius: 3px;
+   padding: 0.1rem 0;
+ }
 .uDownBut {
   border: 0.02rem solid #e4e4e4;
   font-size: 0.26rem;
@@ -17,6 +29,20 @@
   text-align: center;
   border-radius: 0.05rem;
 }
+.guidang {
+  width: 60px;
+  animation: example 1s;
+  height: 35px;
+  margin-left: 10px;
+}
+@keyframes example {
+  from {
+    transform: scale(1.4);
+  }
+  to {
+    transform: scale(1);
+  }
+}
 .inputBox{
     border: 1px solid rgb(226, 226, 226);
     border-radius: 6rpx;
@@ -87,6 +113,7 @@
     background-color: #ffffff;
     z-index: 998;
     font-size: 0.24rem;
+    /* opacity: 0; */
 }
 .footweight{
     padding: 0.15rem 0 0.15rem 0.3rem;
@@ -342,6 +369,7 @@
     border: 1px solid #42a8ff;
     color: #2f9eff;
     background-color: #ffffff;
+    border-radius: 0;
     border-top-left-radius: 3px;
     border-bottom-left-radius: 3px;
   }
@@ -359,26 +387,9 @@
       font-size: 0.28rem;
       border: 0;
       color: #fff;
+      border-radius: 0;
       background-color: #42a8ff;
-      border-radius: 3px;
-    }
-    .footcolButno,
-    .footcolButok {
-      width: 1.4rem;
-      height: 0.8rem;
-      font-size: 0.28rem;
-    }
-    .footcolButno {
-      border: 1px solid #42a8ff;
-      color: #2f9eff;
-      background-color: #ffffff;
-      border-top-left-radius: 3px;
-      border-bottom-left-radius: 3px;
-    }
-    .footcolButok {
-      border: 0;
-      color: #fff;
-      background-color: #42a8ff;
+      /* border-radius: 3px; */
       border-top-right-radius: 3px;
       border-bottom-right-radius: 3px;
     }

pages/home/performanceDetails/performanceDetails.axml

@@ -12,6 +12,7 @@
               <text a:if="{{Information.deptList.length - index > 1}}">,</text></text>
           </view>
         </view>
+        <image mode="scaleToFill" a:if="{{has_finish}}" class="guidang" src="../../../image/guidang.png" />
       </view>
       <view class="result" a:if="{{titList.length > 0}}">
         <view class="flex-box" style="padding-bottom:10rpx" a:for="{{titList}}" a:if="{{item.prop}}">
@@ -43,19 +44,19 @@
     <view a:for="{{inExecution}}" a:for-index="index">
       <view class="modTit">{{ item.theDimension }}</view>
       <view style="padding: 0.24rem;background-color: #fff;">
-        <view class="title" a:if="{{!item.totalScore}}">指标名称</view>
+        <view class="title">{{item.name}}</view>
         <view>
-          <text class="textBox" a:for="{{item.tabList}}" a:for-item="list" a:if="{{list.prop}}">{{ list.prop }}</text>
+          <text class="textBox" style="margin-right:0.12rem" a:for="{{item.tabList}}" a:for-item="list" a:if="{{list.prop}}">{{ list.prop }}</text>
         </view>
         <view a:if="{{item.per_remark}}">
           <view class="orange stanTit">考核标准</view>
-          <view style="border: 0.02rem solid #efefef; border-radius: 0.1rem;white-space: pre-wrap;padding: 0.2rem;font-size:0.26rem"> {{item.per_remark}}</view>
+          <view style="border: 0.02rem solid #efefef; border-radius: 0.1rem;white-space: pre-wrap;padding: 0.2rem;font-size:0.26rem;line-height:0.5rem"> {{item.per_remark}}</view>
         </view>
         <!-- 详情信息 -->
         <block >
-          <view class="flex-box-ce" style="padding:0.1rem 0;font-size:0.28rem" a:for="{{item.details}}" a:for-item="list" a:if="{{list.prop && list.prop != '0'}}">
-            <text class="fontColorX">{{ list.lab }}:</text>
-            <text class="flex-1" style="padding-left:0.2rem">{{list.prop}}</text>
+          <view class="flex-box" style="padding:0.1rem 0;font-size:0.28rem" a:for="{{item.details}}" a:for-item="list" a:if="{{list.prop && list.prop != '0'}}">
+            <text class="fontColorX" style="width:1rem">{{ list.lab }}:</text>
+            <text class="flex-1 {{list.lab=='备注'? 'backCol':''}}" style="padding-left:0.2rem;" >{{list.prop}}</text>
           </view>
         </block>
         <!-- 评分结果 -->
@@ -63,7 +64,7 @@
           <view a:for="{{item.scoreList}}" a:for-item="list" a:if="{{list.prop&&list.isShow}}">
             <view class="flex-box" style="padding:0.1rem 0;font-size:0.28rem" a:if="{{list.pointShow}}">
               <text style="color:#757575;">{{ list.lab }}</text>
-              <text class="orange">  评分:</text>
+              <text class="orange" style="padding-left:0.1rem">评分:</text>
               <text>{{ list.prop }}</text>
               <text a:if="{{list.level}}" style="margin-left: .1rem;color: #26a2ff;">{{ list.level }}</text>
             </view>
@@ -84,10 +85,10 @@
         
         <view style="border-top: 1px solid rgb(241, 241, 241); margin-top: 0.2rem;" a:if="{{item.update_time}}">
           <block a:if="{{item.returnStr}}">
-            <view a:if="{{item.returnStr.indexOf('今天')>=0}}" class="orange" style="font-size: 0.28rem;padding-left:1rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
-            <view a:elif="{{item.returnStr.indexOf('昨天')>=0}}" class="green" style="font-size: 0.28rem;padding-left:1rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
-            <view a:elif="{{item.returnStr.indexOf('前天')>=0}}" style="font-size: 0.28rem;padding-left:1rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
-            <view a:else style="font-size: 0.28rem;padding-left:1rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
+            <view a:if="{{item.returnStr.indexOf('今天')>=0}}" class="orange" style="font-size: 0.28rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
+            <view a:elif="{{item.returnStr.indexOf('昨天')>=0}}" class="green" style="font-size: 0.28rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
+            <view a:elif="{{item.returnStr.indexOf('前天')>=0}}" style="font-size: 0.28rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
+            <view a:else style="font-size: 0.28rem;padding-top: 0.24rem;">{{item.returnStr}}</view>
           </block>
         </view>
         
@@ -113,7 +114,7 @@
     <view a:if="{{recordList.length > 0}}">
       <view class="modTit">记录</view>
       <view style="padding: 0.24rem;background-color: #fff;">
-        <view class="jl-item" a:for="{{recordList}}">
+        <view class="jl-item" a:for="{{recordList}}" a:if="{{index<recordIndex}}">
           <view class="flex-box-ce">
             <img-box id="{{item.employee_id}}" name="{{item.name}}" height="60rpx" width="60rpx" fSize="24rpx"></img-box>
             <text class="flex-1" style="padding-left:10rpx">{{ item.name }}</text>
@@ -125,6 +126,7 @@
           </view>
           <view a:if="{{index != recordList.length - 1}}" class="bian"></view>
         </view>
+        <view a:if="{{recordList.length>4}}" class="blue" style="text-align: center;" catchTap="showRecord">{{recordStr}}</view>
       </view>
     </view>
     
@@ -269,7 +271,7 @@
           </view>
           <view class="fdy {{item.status == 1? 'blue':'' }}">
             <text style="height: 100%;padding-right:.15rem;">{{ index + 1 }}.</text>
-            <view>{{ item.remark }}
+            <view>{{ item.remark }}<text a:if="{{item.remark=='执行中'}}">：</text>
               <text a:if="{{item.target.length > 0}}">
                 <text a:for="{{item.target}}" a:for-item="item2" a:for-index="index2">{{ item2.employee_name }}
                   <text a:if="{{item.target.length - index2 > 1}}">,</text></text>
@@ -295,20 +297,25 @@
         </view>
         <view class="apdData {{(logList.length == index + 1)? 'apdborderNO':''}}">
           <view class="flex-box-v">
-            <view class="line-feed" style="font-size:.3rem;color:block;font-width:600">{{ item.title }}</view>
+            <text class="line-feed" style="font-size:.3rem;color:block;font-width:600">{{ item.title }}</text>
             <text style="font-size:.24rem;padding:0.2rem 0" class="fontColorX">
-              {{ item.date }}
-              <text a:if="{{logText == '管理记录'}}" style="padding-left:10rpx">记录人：{{ item.userName }}</text>
+              {{ item.date }}更新
+              <text a:if="{{logText == '管理记录'}}" style="padding-left:10rpx">记录人:{{ item.userName }}</text>
             </text>
             <text class="line-feed" style="font-size:.25rem;color:#505050;">
               {{item.remark}}
             </text>
           </view>
-          <block a:if="{{item.images}}">
+          <!-- <block a:if="{{item.images}}">
             <view class="flex-box-ce" style="margin: 10px 0;" a:if="{{item.images.length > 0}}">
               <image class="image" a:for="{{item.images}}" a:for-item="e" style="border-radius: 3px;margin-right: 10px;width:200rpx;height:200rpx" 
                 src="{{e.url}}" />
             </view>
+          </block> -->
+          <block a:if="{{item.append.length}}">
+            <view class="images flex-box-ce" a:for="{{item.append}}" a:for-item="e" style="margin-top:16rpx">
+              <view class="flex-1 blue font-flex-word" catchTap="showImg" data-item="{{e}}">{{e.fileName}}</view>
+            </view>
           </block>
         </view>
       </view>
@@ -327,9 +334,10 @@
           </label>
         </view>
         <view class="aite" catchTap="openSelect" data-index='2'>
-          <text class="blue" style="padding-right:6rpx">@</text>
+          <text class="blue" style="padding-right:6rpx">请选择需要@的人:</text>
           <text a:for="{{users}}">{{item.name}},</text>
         </view>
+        <!-- <view style="font-size:0.24rem;color:#888"></view> -->
       </view>
       <view class="windows-btn flex-box flex-v-ce">
         <view class="flex-1" catchTap="closeWindows">取消</view>
@@ -337,6 +345,7 @@
       </view>
     </view>
   </view>
+
   <!-- 评分展示 -->
   <view class="windows" a:if="{{isPoint}}">
     <view class="windows-box">
@@ -358,10 +367,11 @@
         <button type="default" class="flex-1"catchTap="score">确定</button>
       </view>
     </view>
-  </view>  
+  </view>
+
   <view class="box" animation="{{animationInfo}}">
-    <select-section-staff isAllSelect="{{false}}" isBoss="{{true}}" selectUser="{{employeeObj}}" onClose="onClose" onConfirm="confirm" 
+    <select-section-staff isAllSelect="{{false}}" selectUser="{{employeeObj}}" onClose="onClose" onConfirm="confirm" 
       a:if="{{isShowstaff=='1'}}" />
-    <select-section-staff isBoss="{{true}}" selectUser="{{users}}" onClose="onClose" onConfirm="onSelectUser" a:if="{{isShowstaff=='2'}}" />
+    <select-section-staff  selectUser="{{users}}" onClose="onClose" onConfirm="onSelectUser" a:if="{{isShowstaff=='2'}}" />
   </view>
 </view>

pages/home/performanceDetails/performanceDetails.js

@@ -110,19 +110,32 @@ Page({
     isSuperior: false,//判断当前登录者是否是该考核人的上级
     boxTop:0,
     ding_msg: false,//判断当前登录者是否是该考核人的上级
+    recordIndex:5,
+    recordStr:'全部记录',
   },
   onLoad(e) {
     that = this;
+    // dd.alert({
+    //   title: '亲',
+    //   content: JSON.stringify(e),
+    //   buttonText: '我知道了',
+    //   success: () => {
+    //   },
+    // });
     dd.setNavigationBar({ title: e.tel });
     this.setData({
       param: e,
       userInfo: app.globalData.userData,
       userList: app.globalData.usersList
     });
+    if (e.corpId) {
+      that.setData({ corpId: e.corpId });
+      app.globalData.corpId = e.corpId
+    }
     if (this.data.param.paths && this.data.param.data) {
       let data = JSON.parse(this.data.param.data);
       data.employee_id_code = app.returnCode(data.employee_id)
-      app.$post('api/per/package/msg/cc', data).then(res => { });
+      app.$post('api/per/package/msg/cc', data).then(res => {});
     }
   },
   onShow() {
@@ -133,9 +146,18 @@ Page({
     if (app.globalData.userData) {
       that.employeeDet();
     } else {
-      app.login(app.globalData.corpId, function (is) {
+      let corpId = that.data.corpId ? that.data.corpId : app.globalData.corpId
+      app.login(corpId, function (is) {
         if (is) {
-          that.employeeDet();
+          that.setData({
+            userInfo: app.globalData.userData,
+          });
+          that.getUserList(()=>{
+            that.setData({
+               userList: app.globalData.usersList
+            });
+            that.employeeDet();
+          })
         } else {
           dd.reLaunch({
             url: '../../index/noJurisdiction/noJurisdiction'
@@ -144,6 +166,33 @@ Page({
       }, function () { })
     }
   },
+  getUserList(fun=function(){}) {
+    app.$get("api/per/user/employee_list", { page: 0, page_size: 0 }).then((res) => {
+      let list = res.data.data.list
+      let data = {}
+      for (let i in list) {
+        if (list[i].is_scope === 0||list[i].is_official ===0) {
+					list[i].name = list[i].name + '(未启用)';
+				}
+        data[list[i].id] = list[i];
+      }
+      app.globalData.usersList = data;
+      fun()
+    })
+  },
+  showRecord(){
+      if(this.data.recordIndex==5){
+        this.setData({
+            recordIndex:100000,
+            recordStr:'收起',
+        })
+      }else{
+        this.setData({
+            recordIndex:5,
+            recordStr:'全部记录',
+        })
+      }
+  },
   onPageScroll(e) {
     if (e.scrollTop != 0) {
       this.setData({
@@ -263,7 +312,7 @@ Page({
       pointList: pointList,
       pointData: data
     })
-    if (this.data.ruleScore == 1) {
+    if (this.data.ruleScore == 1&&num==1) {
       //只评总分不需要弹窗
       this.setData({
         isPoint: true,
@@ -612,6 +661,19 @@ Page({
       })
     }, 100)
   },
+  showImg(e) {
+    let item = e.target.dataset.item
+    app.$get('api/drive/grant', { file_id: item.fileId }).then(res => {
+      dd.previewFileInDingTalk({
+        corpId: app.globalData.corpId,
+        spaceId: item.spaceId,
+        fileId: item.fileId,
+        fileName: item.fileName,
+        fileSize: item.fileSize,
+        fileType: item.fileType,
+      })
+    })
+  },
   openVas(e) {
     let index = e.target.dataset.index
     let item = e.target.dataset.item
@@ -1070,7 +1132,7 @@ Page({
           });
         });
         dimeTab.forEach(arr => {
-          arr.returnStr = returnStr(arr.action_update)
+          arr.returnStr = returnStr(arr.update_time)
           let points = []; //最终显示评分
           arr.scoreList.forEach(item => {
             item.isShow = false;//控制是否显示更多
@@ -1095,6 +1157,7 @@ Page({
         this.setData({
           inExecution: dimeTab,
         })
+
         this.pdLc(); //流程结束后的判断
         let titDatas = [];
         if (data.publicity == 1 && (!this.data.flowNow.code || this.data.flowNow.code == 'review')) {
@@ -1112,6 +1175,7 @@ Page({
         })
         let recordList = [];
         // 记录
+
         let record = res.data.data.record;
         record.forEach((item, index) => {
           if (this.data.userList[item.employee_id]) {
@@ -1132,6 +1196,7 @@ Page({
         })
       }
     }).catch((err) => {
+      console.log(err)
       if (err.data.code == 0) {
         dd.reLaunch({
           url: '../../index/noPage/noPage'

pages/home/resultValueEntry/resultValueEntry.axml

@@ -1,8 +1,8 @@
 <view>
   <view class="flex-box-ce header">
-    <view class="{{tabIndex==1? 'tabs':''}} flex-1" onTap="tabAction" data-index="1">已录入
+    <view class="{{tabIndex==1? 'tabs':''}} flex-1" onTap="tabAction" data-index="1">未录入
       <text a:if="{{age.num1}}" class="red">({{age.num1}})</text></view>
-    <view class="{{tabIndex==2? 'tabs':''}} flex-1" onTap="tabAction" data-index="2">未录入
+    <view class="{{tabIndex==2? 'tabs':''}} flex-1" onTap="tabAction" data-index="2">已录入
       <text a:if="{{age.num2}}" class="red">({{age.num2}})</text></view>
   </view>
   <view class="main">
@@ -40,7 +40,7 @@
         <view>暂存</view>
       </view>
       <view class="footBut flex-box-ce">
-        <view class="footcolButno" catchTap="scorerveno">取消</view>
+        <!-- <view class="footcolButno" catchTap="scorerveno">取消</view> -->
         <view class="footcolButok" data-index='0' catchTap="save">提交</view>
       </view>
     </view>

pages/home/resultValueEntry/resultValueEntry.js

@@ -7,14 +7,14 @@ Page({
     list: [],
     page: 1,
     id: '',
-    packageName:'',
+    packageName: '',
   },
   onLoad(e) {
     that = this;
     dd.setNavigationBar({ title: "结果值录入" });
     this.setData({
       id: e.id,
-      packageName:e.tel,
+      packageName: e.tel,
     })
     this.getPackageDtail()
   },
@@ -25,7 +25,7 @@ Page({
     })
     this.getPackageDtail()
   },
-  bindTextAreaBlur(e){
+  bindTextAreaBlur(e) {
     this.setData({
       [`noStatusList[${e.target.dataset.index}].result`]: e.detail.value,
     });
@@ -60,21 +60,21 @@ Page({
       return;
     }
     this.setData({
-      bootBool:true
+      bootBool: true
     })
     app.$post('api/per/package/record_result', data)
       .then(res => {
-        app.globalData.showToast('设置成功');
         this.getPackageDtail();
-		setTimeout(() => {
-		    this.setData({
-		      bootBool:false
-		    })
-		}, 3000);
+        setTimeout(() => {
+          app.globalData.showToast(num == '1' ? '暂存成功' : '提交成功');
+          this.setData({
+            bootBool: false
+          })
+        }, 1000);
       })
   },
   getPackageDtail() {
-    app.$get('api/per/package/employee/info', { id: this.data.id }).then(res => {
+    app.$get2('api/per/package/employee/info', { id: this.data.id }).then(res => {
       let data = res.data.data;
       let dimension = data.dimension;
       let relevance_employee = data.relevance_employee;

pages/home/statementDetails/statementDetails.js

@@ -120,6 +120,7 @@ Page({
   },
   getList(is) {
     if (!is) { this.setData({ page: 1 }) };
+    this.setData({list: []})
     let data = {
       package_id: this.data.id,
       doing_id: this.data.smdsins,

pages/home/statistics/statistics.axml

@@ -1,5 +1,5 @@
 <view>
-  <view class="">
+  <view class="" a:if="{{defaultRuleId}}">
     <view class="header flex-box-ce flex-center-center" catchTap="openSelect">
       <text class="text font-flex-word">{{jxName}}</text>
       <text class="iconfont icon-jiantouxia"></text>
@@ -9,8 +9,7 @@
         <progress percent="{{rate}}" stroke-width="12" active show-info />
         <view class="flex-box-ce" style="padding-top:0.24rem;font-size:0.28rem">
           <view class="flex-1"> 考核进度：
-            <text class="orange">{{theProgressOf.complete}}人</text>/
-            <text class="blue">{{theProgressOf.theTotalNum}}人</text></view>
+          <text class="blue">{{theProgressOf.complete}}人</text>/<text>{{theProgressOf.theTotalNum}}人</text></view>
           <view class="blue" catchTap="personnel_detailsPath">查看人员明细
             <text class="iconfont icon-jiantouyou blue" style="font-size:0.24rem;position: relative;top:-2rpx"></text></view>
         </view>
@@ -46,7 +45,7 @@
             <text class="iconfont icon-jiantouxia"></text>
           </view>
         </view>
-        <view class="flex-box-ce statmentperson" a:for="{{jxUserList}}" catchTap="openDetail" data-item="{{item}}">
+        <view class="flex-box-ce statmentperson" a:for="{{jxUserList}}" catchTap="openDetail" data-item="{{item}}" a:key="{{item.id}}">
           <text style="padding:0 6rpx" class="fontColorX">{{index+1}}</text>
           <img-box id="{{item.id}}" name="{{item.name}}" height="60rpx" width="60rpx" fSize="24rpx" style="margin-top:.08rem;"></img-box>
           <view class="flex-1" style="margin-left:0.2rem">
@@ -58,7 +57,7 @@
             </view>
           </view>
           <view style="font-size:.26rem;line-height: .8rem;text-align:center;">
-            <text>{{ item.point == 0 ? '-' : item.point }}</text>/
+            <text>{{ item.point === '' ? '-' : item.point }}</text>/
             <text a:if="{{item.level != ''}}" class="orange">{{ item.level == 'empty' ? '无等级' : item.level }}</text>
             <text a:else>无等级</text>
           </view>
@@ -80,11 +79,11 @@
           </view>
           <text class="iconfont icon-jiantouyou"></text>
         </view>
-
       </view>
       <view style="height:1rem"></view>
     </scroll-view>
   </view>
+  <no-data a:if="{{!defaultRuleId}}" content="暂无考核内容"></no-data>
   <view class="box" animation="{{animationInfo}}">
     <select-jx defaultId="{{defaultRuleId}}" tree="true" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType}}" />
   </view>

pages/home/statistics/statistics.js

@@ -3,7 +3,7 @@ var that;
 var animation;
 var chart1;
 var chart2;
-import {setCache,getCache} from '../../../utils/util'
+import { setCache, getCache } from '../../../utils/util'
 Page({
   data: {
     tabIndex: 1,
@@ -42,7 +42,7 @@ Page({
     statementperson: [],
 
     jxUserList: [],//结果分析人员列表
-    selectPftiData:{},//选择的绩效
+    selectPftiData: {},//选择的绩效
   },
   onLoad() {
     that = this;
@@ -69,37 +69,42 @@ Page({
     })
   },
   cellDept(e) {
-      let item = e.target.dataset.item
-      let data = {
-        paths: 'statdeEcharts',
-        dept_o: item,
-        asslist: this.data.selectPftiData,
-        index: 0,
-      }
-      setCache('statementDetails', data)
-      dd.navigateTo({
-        url: `../statementDetails/statementDetails`
-      })
-    },
-  openDetail(e){
-      let item=e.target.dataset.item
-      let str=`../performanceDetails/performanceDetails?assId=${this.data.selectPftiData.id}&staffId=${item.id}&tel=${this.data.selectPftiData.name}`
-      dd.navigateTo({
-        url: str
-      })
+    let item = e.target.dataset.item
+    let data = {
+      paths: 'statdeEcharts',
+      dept_o: item,
+      asslist: this.data.selectPftiData,
+      index: 0,
+    }
+    setCache('statementDetails', data)
+    dd.navigateTo({
+      url: `../statementDetails/statementDetails`
+    })
+  },
+  openDetail(e) {
+    let item = e.target.dataset.item
+    let str = `../performanceDetails/performanceDetails?assId=${this.data.selectPftiData.id}&staffId=${item.id}&tel=${this.data.selectPftiData.name}`
+    dd.navigateTo({
+      url: str
+    })
   },
   // 结果分析人员列表
   isShow() {
     let arr = [];
+    this.setData({
+      jxUserList: []
+    })
     this.data.allStatementResult.map(item => {
       if (this.isQualified(item)) {
-        item.name=app.globalData.usersList[item.id].name
+        item.name = app.globalData.usersList[item.id].name
         arr.push(item);
       }
     });
-    this.setData({
-      jxUserList: arr
-    })
+    setTimeout(() => {
+      this.setData({
+        jxUserList: arr
+      })
+    }, 200)
   },
   isQualified(item) {
     let deptId = this.data.department_list[this.data.department_index].value
@@ -270,7 +275,7 @@ Page({
           }
         });
         this.setData({
-          allStatementResult: theResultsOfList
+          allStatementResult: theResultsOfList,
         })
         this.isShow();
       }
@@ -327,11 +332,13 @@ Page({
         }
       });
       that.setData({
-        selectPftiData:obj[0],
-        defaultRuleId: obj[0].id,
-        jxName: obj[0].name,
+        selectPftiData: obj.length>0 ? obj[0] : '',
+        defaultRuleId: obj.length>0 ? obj[0].id : '',
+        jxName: obj.length>0 ? obj[0].name : '',
       })
-	    this.statisticalPeople();
+      if (obj.length>0) {
+        this.statisticalPeople();
+      }
     })
   },
   onInitChart2(F2, config) {
@@ -463,7 +470,7 @@ Page({
     that.setData({
       defaultRuleId: e.id,
       jxName: e.name,
-      selectPftiData:e
+      selectPftiData: e
     });
     this.statisticalPeople();
   },

pages/home/workList/workList.js

@@ -64,6 +64,9 @@ Page({
   },
   getInitData() {
     app.$get('api/per/package/info_v3_aid', { package_id: this.data.id }).then(res => {
+      this.setData({
+        employee_list:[{ id: 0, name: '全部员工' }]
+      })
       let employee_list = this.data.employee_list;
       employee_list.push(...res.data.data.employees);
       this.setData({

pages/index/begin/begin.axml

@@ -1,6 +1,6 @@
 <view>
   <view class="noData flex-box-v flex-center-center">
-    <image mode="scaleToFill" src="../../image/logo.png" class="initImg"/>
+    <image mode="scaleToFill" src="../../../image/logo.png" class="initImg"/>
     <text class="text">{{msg}}</text>
     <button type="primary" a:if="{{num==3}}" class="btn" catchTap="loginAll">同步企业信息</button>
   </view>

pages/index/init/init.axml

@@ -1,5 +1,5 @@
 <view>
   <view class="noData flex-box-v flex-center-center">
-    <image mode="scaleToFill" src="../../image/logo.png" class="initImg"/>
+    <image mode="scaleToFill" src="../../../image/logo.png" class="initImg"/>
   </view>
 </view>

pages/index/start/start.axml

@@ -10,14 +10,14 @@
         授权员工【开启绩效管理】
       </view>
       <view class="flex-box  c_main">
-        <image mode="scaleToFill" src="../../image/dt.png"></image>
+        <image mode="scaleToFill" src="../../../image/dt.png"></image>
         <view class="c_text fontColorZ">
           <view>授权后，员工才能正式进入应用</view>
           <view class="fontColorF">设置路径：钉钉电脑版-工作-功道云绩效制-设置-组织架构</view>
         </view>
       </view>
       <view class="c_footer">
-        <image mode="scaleToFill" src="../../image/start3.jpg" data-str="../../image/start3.jpg"></image>
+        <image mode="scaleToFill" src="../../../image/start3.jpg" data-str="../../../image/start3.jpg"></image>
       </view>
       <button type="primary" class="btn" data-index="2" catchTap="openView">下一步</button>
     </view>
@@ -31,14 +31,14 @@
         添加【绩效管理员】来协助执行绩效管理
       </view>
       <view class="flex-box  c_main">
-        <image mode="scaleToFill" src="../../image/dt.png"></image>
+        <image mode="scaleToFill" src="../../../image/dt.png"></image>
         <view class="c_text fontColorZ">
           <view>推荐行政人事或有执行力的管理层来当【绩效管理员】</view>
           <view class="fontColorF">设置路径：钉钉电脑版-工作-功道云绩效制-设置-角色权限</view>
         </view>
       </view>
       <view class="c_footer">
-        <image mode="scaleToFill" src="../../image/start2.jpg" data-str="../../image/start2.jpg"></image>
+        <image mode="scaleToFill" src="../../../image/start2.jpg" data-str="../../../image/start2.jpg"></image>
       </view>
       <button type="primary" class="btn" data-index="3" catchTap="openView">下一步</button>
     </view>
@@ -51,7 +51,7 @@
         <view class="fontColorF">请前往电脑端体验完整管理流程</view>
       </view>
       <view class="c_footer">
-        <image mode="scaleToFill" src="../../image/start1.jpg" data-str="../../image/start1.jpg"></image>
+        <image mode="scaleToFill" src="../../../image/start1.jpg" data-str="../../../image/start1.jpg"></image>
       </view>
       <view class="fontColorT text_f">路径：钉钉电脑端（需下载安装）-工作-功道云绩效制</view>
 

pages/serve/addMoney/addMoney.acss

@@ -0,0 +1,17 @@
+.footer{
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: #fff;
+  padding: 10rpx;
+  border-top: 1px solid #f1f1f1;
+}
+.footer view{
+  border-radius: 6rpx;
+  background: #26A2FF;
+  color: #fff;
+  height: 88rpx;
+  text-align: center;
+  line-height: 88rpx;
+}

pages/serve/addMoney/addMoney.axml

@@ -0,0 +1,9 @@
+<view>
+  <image  src="../../../image/money.jpg" mode='widthFix' style="width:100%;"/>
+  <view style="height:100rpx">
+    
+  </view>
+  <view class="footer" onTap="openUrl">
+    <view>续费升级</view>
+  </view>
+</view>

pages/serve/addMoney/addMoney.js

@@ -0,0 +1,16 @@
+var app = getApp();
+var that;
+import 'dingtalk-jsapi/entry/mobile';
+import openLink from 'dingtalk-jsapi/api/biz/util/openLink';
+Page({
+  data: {},
+  onLoad() {
+    that = this;
+    dd.setNavigationBar({ title: "续费升级" });
+  },
+  openUrl() {
+      openLink({
+        url: 'https://h5.dingtalk.com/open-market/share.html?shareGoodsCode=D34E5A30A9AC7FC6327AB5E6D2D145418457E59F16C3FC969F1A50AEF2E5E320588012470F1AB045&token=d37751d45abad15178adf60f936d7c28&shareUid=C5EB7B5C85793F3D909B2AC4771E12D7'
+      })
+  },
+});

pages/serve/addMoney/addMoney.json

@@ -0,0 +1 @@
+{}

pages/serve/serve/serve.axml

@@ -2,12 +2,12 @@
   <view style="height:0.2rem"></view>
   <view style="margin:0.2rem;margin-top:0">
     <view class="header">
-      <view class="name font-flex-word">广东功道云数字科技有限公司</view>
+      <view class="name font-flex-word">{{userData.site.name}}</view>
       <view class="num">
         <text>30人</text>套餐</view>
       <view class="flex-box-ce date">
-        <view class="flex-1">有效期至：2021年12月15日</view>
-        <view>续费/升级</view>
+        <view class="flex-1">有效期至：{{expireTime}}</view>
+        <view catchTap="openUrl2">续费/升级</view>
       </view>
     </view>
   </view>
@@ -42,7 +42,7 @@
       </view>
     </view>
   </view>
-  <view class="footer">
+  <view class="footer" a:if="{{isgetRole}}">
       <view class="flex-box-ce">
         <image mode="scaleToFill" src="../../../image/kfdh.png" />
         <view class="texts">
@@ -50,6 +50,6 @@
            <view>你可以随时联系我查询相关问题或帮助</view>
         </view> 
       </view>
-      <view class="btn">联系人工客服</view>
+      <view class="btn" catchTap="openKf">联系人工客服</view>
   </view>
 </view>

pages/serve/serve/serve.js

@@ -1,17 +1,38 @@
 var app = getApp();
 var that;
+import 'dingtalk-jsapi/entry/mobile';
+import openLink from 'dingtalk-jsapi/api/biz/util/openLink';
+import { getRole } from '../../../utils/util'
+import moment from 'moment' // 时间库
 Page({
   data: {
-    knowFrom:'action',
+    knowFrom: 'action',
+    userData: {},
+    isgetRole:getRole(1),
+    expireTime:'',
   },
   onLoad() {
-    that = this;
+    that = this
+    that.setData({
+      userData: app.globalData.userData,
+      expireTime:moment(Number(app.globalData.userData.site.expire_time+'000')).format('YYYY-MM-DD')
+    })
     dd.setNavigationBar({ title: "服务台" });
   },
+  openUrl2() {
+    dd.navigateTo({
+      url: '../addMoney/addMoney'
+    })
+  },
+  openKf() {
+    openLink({
+      url: `https://page.dingtalk.com/wow/dingtalk/act/serviceconversation?wh_biz=tm&showmenu=false&goodsCode=DT_GOODS_881607043109331&corpId=${app.globalData.corpId}&token=5784a3e6b5e025ee891517ea814180f4`
+    })
+  },
   openUrl(e) {
     var index = e.target.dataset.index;
     dd.navigateTo({
-      url: '../webView/webView?index='+index
+      url: '../webView/webView?index=' + index
     })
   },
 });

pages/serve/webView/webView.axml

@@ -1,3 +1,3 @@
 <view>
-    <web-view id="web-view-1" src="https://es6.ruanyifeng.com" onMessage="test"></web-view>
+    <web-view id="web-view-1" src="{{url}}" onMessage="test"></web-view>
 </view>

pages/serve/webView/webView.js

@@ -3,9 +3,30 @@ var that;
 Page({
   data: {
     knowFrom:'action',
+    url:'',
   },
-  onLoad() {
+  onLoad(e) {
     that = this;
-    // dd.setNavigationBar({ title: "服务台" });
+    if(e.index){
+      let index=e.index;
+      let url='https://www.yuque.com/books/share/9aed09b4-4387-4e5f-ae0e-afc748390a1e?#';
+      if(index=='1'){
+          url='https://www.yuque.com/books/share/9aed09b4-4387-4e5f-ae0e-afc748390a1e?#'
+      }else if(index=='2'){
+          url='https://www.yuque.com/books/share/e9c9f16b-eeb7-4598-b5da-263f2726942c?#'
+      }else if(index=='3'){
+          url='https://www.yuque.com/books/share/20a515ac-c557-4363-9a27-65aef164b4c3?#'
+      }else if(index=='4'){
+          url='https://www.yuque.com/books/share/3febbd74-3455-4cfa-abc0-035931cfcc3b?#'
+      }else{
+          url='https://www.yuque.com/docs/share/22b4bb49-2151-4b46-8465-89301957102a?#'
+      }
+      this.setData({
+         url:url
+      })
+    }
   },
+  test(){
+    
+  }
 });

utils/iconfont.acss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3160108 */
-  src: url('//at.alicdn.com/t/font_3160108_graccgfesiv.woff2?t=1645511265397') format('woff2'),
-       url('//at.alicdn.com/t/font_3160108_graccgfesiv.woff?t=1645511265397') format('woff'),
-       url('//at.alicdn.com/t/font_3160108_graccgfesiv.ttf?t=1645511265397') format('truetype');
+  src: url('//at.alicdn.com/t/font_3160108_3l1umdf6fad.woff2?t=1648863162490') format('woff2'),
+       url('//at.alicdn.com/t/font_3160108_3l1umdf6fad.woff?t=1648863162490') format('woff'),
+       url('//at.alicdn.com/t/font_3160108_3l1umdf6fad.ttf?t=1648863162490') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-dianji:before {
+  content: "\e6ca";
+}
+
 .icon-canyu:before {
   content: "\e81a";
 }