3.23

app.js

@@ -95,7 +95,7 @@ App({
   },
   routerGet(url, data = {}, Accept) {
     return new Promise(function (resolve, reject) {
-      // dd.showLoading();
+      dd.showLoading();
       dd.httpRequest({
         url: baseUrl + url,
         method: 'GET',
@@ -134,7 +134,7 @@ App({
           reject(res);
         },
         complete: function () {
-          // dd.hideLoading();
+          dd.hideLoading();
         }
       });
     })

package-lock.json

@@ -100,9 +100,9 @@
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
     "dingtalk-design-libs": {
-      "version": "0.0.20",
-      "resolved": "https://registry.npmjs.org/dingtalk-design-libs/-/dingtalk-design-libs-0.0.20.tgz",
-      "integrity": "sha512-PojsAOMSquSnzdc4K8sNtKn6uCeIzII2fH8qnQn6nDdGjR5ZFwWKyyDNwPsL5eGBQI+tzoC2wz9Ot2PdfP4T6w==",
+      "version": "0.0.21",
+      "resolved": "https://registry.npmjs.org/dingtalk-design-libs/-/dingtalk-design-libs-0.0.21.tgz",
+      "integrity": "sha512-IIJLjYbkP/MS5c/HvumUVKg76KXMdoGBywgpfRojAqHo6mV3mlxKLmzpqq0RIogaP5kunGekFgVZPn0Nrn4F/Q==",
       "requires": {
         "axios": "^0.21.1",
         "dingtalk-jsapi": "*",
@@ -111,9 +111,9 @@
       }
     },
     "dingtalk-jsapi": {
-      "version": "2.13.71",
-      "resolved": "https://registry.npmjs.org/dingtalk-jsapi/-/dingtalk-jsapi-2.13.71.tgz",
-      "integrity": "sha512-fi5qX/BvxZ/HopKS7T2V84fiG2CWzcPaSblC0UqAU/cVdJ4QZMt/19P0o5kWrHbflAMSh72ygP8ErrRwE/tKmg==",
+      "version": "2.13.91",
+      "resolved": "https://registry.npmjs.org/dingtalk-jsapi/-/dingtalk-jsapi-2.13.91.tgz",
+      "integrity": "sha512-2r1ky4h/UIjAB+uO+litvtddjLUNbpIbtq2GyBlbRnD7acIl2V26pPp2S1hetw6+Getd3/zhva/V2N6dl07GRw==",
       "requires": {
         "promise-polyfill": "^7.1.0"
       }

pages/home/actionplanDetails/actionplanDetails.acss

@@ -16,12 +16,12 @@
    background-color: #fff;
   border-bottom: 0.02rem solid #ebedf0;
 }
-.icon{
+/* .icon{
   right: 0.3rem;
   top: 0.22rem;
   position: absolute;
   z-index: 9999;
-}
+} */
   .pullUpdel {
     margin: 0.15rem 0 6rem 0;
     padding: 0.25rem;
@@ -83,6 +83,7 @@
 }
 .images{
   position: relative;
+  cursor: pointer;
 }
 .images image{
   display: block;

pages/home/actionplanDetails/actionplanDetails.axml

@@ -30,16 +30,15 @@
       <view class="page-section-demo">
         <textarea onInput="bindTextAreaBlur2" value="{{messageVal}}" auto-height placeholder="选填，请输入备注" maxlength="500" />
       </view>
-      <view class="page-section-demo flex-box">
-        <view class="images" a:for="{{img_fileList}}">
-          <image mode="scaleToFill" src="{{item}}"  catchTap="showImg" data-img="{{item}}"/>
-          <view class="icon" catchTap="deleteImg" data-inde="{{index}}">
-              <icon type="clear" size="16"/>
+      <view class="page-section-demo">
+        <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 catchTap="deleteImg" data-index="{{index}}" style="padding:14rpx 20rpx">
+            <icon type="clear" size="16" />
           </view>
         </view>
-        <view class="van-uploader__upload" catchTap="openImg">
-          <text class="iconfont icon-xiangji" style="color:#dcdee0;font-size:0.46rem;"></text>
-        </view>
       </view>
     </view>
     <view style="margin-bottom:2rem;">
@@ -57,21 +56,23 @@
               {{item.remark}}
             </view>
           </view>
-          <block a:if="{{item.images}}">
-            <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}}" />
+          
+          <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>
+            <!--<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> -->
           </block>
         </view>
       </view>
     </view>
   </view>
-    <!-- 详情 -->
+  <!-- 详情 -->
   <view class="windows" a:if="{{isShowDetil}}">
     <view class="vassheet {{isShowDetil?'showdown':''}}">
       <view class="vasHead" catchTap="showDetil">
-        <icon type="clear" size="20" class="icon"/>
+        <icon type="clear" size="20" class="icon" />
         <text>所属指标</text>
       </view>
       <view class="pullUpdel">
@@ -107,7 +108,7 @@
         </view>
       </view>
       <view class="footer2 flex-box-ce">
-        <view class="flex-1" catchTap="showText" >我知道了</view></view>
+        <view class="flex-1" catchTap="showText">我知道了</view></view>
     </view>
   </view>
 </view>

pages/home/actionplanDetails/actionplanDetails.js

@@ -24,15 +24,19 @@ Page({
     // 上传图标与附件
     img_fileList: [], // 图片附件
     isShowText: false,
-    isShowDetil:false,//显示详情
+    isShowDetil: false,//显示详情
+    append: [],
   },
   onLoad() {
-    that=this;
-   },
+    that = this;
+  },
   onShow() {
     this.setData({
       query: getCache('actionplanDetails')
     })
+    this.setData({
+      append: [],
+    })
     this.init()
   },
   showDetil() {
@@ -46,14 +50,14 @@ Page({
     })
   },
   deleteImg(e) {
-    if (this.data.img_fileList.length==0) {
+    if (this.data.append.length == 1) {
       this.setData({
-        img_fileList:[]
+        append: []
       })
       return false
     }
     this.setData({
-      img_fileList: this.data.img_fileList.splice(e.target.dataset.index, 1)
+      append: this.data.append.splice(e.target.dataset.index-1, 1)
     })
   },
   // 返回时刷新列表数据
@@ -89,22 +93,15 @@ Page({
       app.globalData.showToast('请输入标题');
       return;
     }
-    let images = [];
-    this.data.img_fileList.forEach(item => {
-      let str = item.split("/")
-      images.push(
-        { name: str[str.length - 1], url: item }
-      )
-    })
     let data = {
       package_employee_id: this.data.packId,
       index_id: this.data.apDetails.id,
       title: this.data.titValue,
       remark: this.data.messageVal,
       dimension_xb: this.data.planIndex[0],
-      images: JSON.stringify(images),
-      append: '', //附件
-      appendName: '' //附件名称
+      // images: JSON.stringify(images),
+      append: JSON.stringify(this.data.append), //附件
+      // appendName: '' //附件名称
     };
     this.setData({
       bootBool: true
@@ -116,15 +113,15 @@ Page({
           this.setData({
             titValue: '',
             messageVal: '',
-            img_fileList: [],
+            append: [],
           })
           this.employeeDet();
         }
-		setTimeout(() => {
-		  this.setData({
-		    bootBool: false
-		  })
-		}, 1000);
+        setTimeout(() => {
+          this.setData({
+            bootBool: false
+          })
+        }, 1000);
       })
   },
   closeWt() {
@@ -197,7 +194,7 @@ Page({
           }
         }
       }
-	  this.routeBack();
+      this.routeBack();
     })
   },
   init() {
@@ -250,11 +247,17 @@ Page({
     this.employeeDet();
   },
   showImg(e) {
-    let img = e.target.dataset.img.url
-    dd.previewImage({
-      current: 0,
-      urls: [img],
-    });
+    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,
+      })
+    })
   },
   openDetail(e) {
     let item = e.target.dataset.item
@@ -276,6 +279,28 @@ Page({
   },
   //图片选择
   openImg(e) {
+    let append = this.data.append;
+    app.$get('api/drive/info').then(res => {
+      let spaceId = res.data.data.space_id
+      dd.uploadAttachmentToDingTalk({
+        image: { multiple: true, compress: false, max: 5, spaceId: spaceId },
+        space: { spaceId: spaceId, isCopy: 1, max: 5 },
+        file: { spaceId: spaceId, max: 5 },
+        types: ["photo", "file", "space"],//PC端仅支持["photo","file","space"]
+        success: (res) => {
+          append.push(...res.data);
+          that.setData({
+            append: append
+          })
+        },
+        fail: (err) => {
+
+        }
+      })
+    })
+
+
+    return false
     var files = that.data.img_fileList;
     if (files.length >= 3) {
       app.globalData.showToast("只能上传三张");
@@ -319,9 +344,9 @@ Page({
           success: (res) => {
             if (res.statusCode == 200) {
               if (files.length > 0) {
-                files.push(app.globalData.ALIOSS_URL +'/'+key)
+                files.push(app.globalData.ALIOSS_URL + '/' + key)
               } else {
-                files = [app.globalData.ALIOSS_URL +'/'+ key];
+                files = [app.globalData.ALIOSS_URL + '/' + key];
               }
               that.setData({
                 img_fileList: files

pages/home/addthePlan/addthePlan.axml

@@ -42,16 +42,15 @@
     <view class="page-section-demo">
       <textarea onInput="bindTextAreaBlur2" value="{{messageVal}}" auto-height placeholder="选填，请输入备注" maxlength="500" />
     </view>
-    <view class="page-section-demo flex-box">
-      <view class="images" a:for="{{img_fileList}}">
-        <image mode="scaleToFill" src="{{item}}" catchTap="showImg" data-img="{{item}}" />
-        <view class="icon" catchTap="deleteImg" data-index="{{index}}">
+    <view class="page-section-demo">
+      <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 catchTap="deleteImg" data-index="{{index}}" style="padding:14rpx 20rpx">
           <icon type="clear" size="16" />
         </view>
       </view>
-      <view class="van-uploader__upload" catchTap="openImg">
-        <text class="iconfont icon-xiangji" style="color:#dcdee0;font-size:0.46rem;"></text>
-      </view>
     </view>
   </view>
   <view class="footer">

pages/home/addthePlan/addthePlan.js

@@ -23,12 +23,13 @@ Page({
     assessID: 0,
     planIndex: [],
     // 上传图标与附件
-    img_fileList: [],
+    // img_fileList: [],
     appendObj: {
       append: '',
       append_name: ''
     },
     isShowDetil: false,
+    append: [],
   },
   onLoad() {
     that = this;
@@ -46,11 +47,17 @@ Page({
     })
   },
   showImg(e) {
-    let img = e.target.dataset.img
-    dd.previewImage({
-      current: 0,
-      urls: [img],
-    });
+    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,
+      })
+    })
   },
   deleteList() {
     dd.confirm({
@@ -121,22 +128,22 @@ Page({
       app.globalData.showToast('请输入标题');
       return;
     }
-    let images = [];
-    this.data.img_fileList.forEach(item => {
-      let str = item.split("/")
-      images.push(
-        { name: str[str.length - 1], url: item }
-      )
-    })
+    // let images = [];
+    // this.data.img_fileList.forEach(item => {
+    //   let str = item.split("/")
+    //   images.push(
+    //     { name: str[str.length - 1], url: item }
+    //   )
+    // })
     let data = {
       package_employee_id: this.data.packId,
       index_id: this.data.apDetails.id,
       title: this.data.titValue,
       remark: this.data.messageVal,
       dimension_xb: this.data.planIndex,
-      images: JSON.stringify(images),
-      append: '', //附件
-      appendName: '' //附件名称
+      // images: JSON.stringify(images),
+      append: JSON.stringify(this.data.append), //附件
+      // appendName: '' //附件名称
     };
     if (this.data.arrlist) {
       if (this.data.knowFrom == 'admnin') {
@@ -176,14 +183,14 @@ Page({
     });
   },
   deleteImg(e) {
-    if (this.data.img_fileList.length == 1) {
+    if (this.data.append.length == 1) {
       this.setData({
-        img_fileList: []
+        append: []
       })
       return false
     }
     this.setData({
-      img_fileList: this.data.img_fileList.splice(e.target.dataset.index, 1)
+      append: this.data.append.splice(e.target.dataset.index-1, 1)
     })
   },
   init() {
@@ -198,20 +205,7 @@ Page({
         arrlist: true,
         titValue: this.data.keyszb.title,
         messageVal: this.data.keyszb.remark,
-        appendObj: {
-          append: this.data.keyszb.append,
-          append_name: this.data.keyszb.append_name,
-        }
-      })
-      let images = this.data.keyszb.images;
-      let img_fileList = [];
-      if (images.length > 0) {
-        images.forEach(item => {
-          img_fileList.push(item.url);
-        })
-      }
-      this.setData({
-        img_fileList: img_fileList
+        append: this.data.keyszb.append,
       })
     } else {
       this.setData({
@@ -267,6 +261,29 @@ Page({
   },
   //图片选择
   openImg(e) {
+    let append = this.data.append;
+    app.$get('api/drive/info').then(res => {
+      let spaceId = res.data.data.space_id
+      dd.uploadAttachmentToDingTalk({
+        image: { multiple: true, compress: false, max: 5, spaceId: spaceId },
+        space: { spaceId: spaceId, isCopy: 1, max: 5 },
+        file: { spaceId: spaceId, max: 5 },
+        types: ["photo", "file", "space"],//PC端仅支持["photo","file","space"]
+        success: (res) => {
+          append.push(...res.data);
+          that.setData({
+            append: append
+          })
+        },
+        fail: (err) => {
+
+        }
+      })
+    })
+    return false
+
+
+
     var files = that.data.img_fileList;
     if (files.length >= 3) {
       app.globalData.showToast("只能上传三张");

pages/home/backlog/backlog.js

@@ -7,7 +7,7 @@ Page({
     minuteArray: [
       { label: '全部待办', value: 0 },
       { label: '目标制定', value: 1 },
-      { label: '指标确认', value: 2 },
+      { label: '目标确认', value: 2 },
       { label: '结果录入', value: 4 },
       { label: '评分', value: 5 },
       { label: '审批', value: 9 }

pages/home/home/home.acss

@@ -1,8 +1,29 @@
 .top-img{
   width: 100%;
 }
-
-
+.ts{
+  height: 128rpx;
+  padding: 16rpx 32rpx;
+  font-size: 24rpx;
+  color: #089fff;
+  background: #fff;
+  font-weight: 500;
+  box-sizing: border-box;
+}
+.ts image{
+  width: 48rpx;
+  height: 48rpx;
+}
+.ts view{
+  padding: 0 16rpx;
+}
+.ts button{
+  width: 188rpx;
+  height: 56rpx;
+  background-color: #089fff;
+  line-height: 56rpx;
+  font-size: 24rpx;
+}
 .que{
     background-color: #fff;
     text-align: center;

pages/home/home/home.axml

@@ -1,9 +1,21 @@
 <view>
   <view class="headerBox" style="position: relative;">
+    <view class="flex-box ts flex-center-center" a:if="{{isSubject}}">
+    <image mode="scaleToFill" src="../../../image/tz.png"></image>
+    <view class="flex-1">你正在使用个人体验版，如需正式使用，请联系管理员</view>
+    <button type="primary" onTap="openGly">联系管理员</button>
+  </view>
     <view class="top"><image class="top-img" mode="widthFix" src="../../../image/xcxbj.png" /></view>
     <view style="height: 0.8rem;background: #fff;"></view>
-    <view class="header flex-box-ce">
+    <view class="header flex-box-ce" style="top:{{isSubject? '180rpx':'50rpx'}}">
       <view style="width:0.9rem;height:0.9rem;margin-right:20rpx;border-radius:100%">
+        <!-- <open-data
+          openType="userName"
+          openId="{{userInfo.user_id}}"
+          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">
@@ -26,7 +38,7 @@
     <view class="flex_one">两分钟了解功道云绩效</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>
+    <view class="{{tabIndex==1? 'tabs':''}} flex-1" onTap="tabAction" data-index="1">待办事项 <text class="red" style="padding-left:10rpx">({{dbTolal}})</text></view>
     <view class="{{tabIndex==2? 'tabs':''}} flex-1" onTap="tabAction" data-index="2">未读消息 <text class="red" style="padding-left:10rpx">({{xxTolal}})</text></view>
     <view class="flex-1"></view>
   </view>

pages/home/home/home.js

@@ -1,6 +1,8 @@
 var app = getApp();
 var that;
 import { _debounce, getCache } from '../../../utils/util'
+import 'dingtalk-jsapi/entry/union';
+import { contactAdminToUseApp } from 'dingtalk-design-libs';
 Page({
   data: {
     tabIndex: 1,
@@ -14,7 +16,12 @@ Page({
     dbTolal: 0,
     xxList: [],
     xxTolal: 0,
-    userInfo: app.globalData.userData
+    userInfo: app.globalData.userData,
+
+    isSubject: false,//判断是否是个人版进入
+    mainCorpId: '',//如果是个人版，这个企业ID是登录者所在的企业ID，不是钉钉那边提供的隐藏企业ID
+    errorInfo:'',
+    openDataAvailable: dd.canIUse('open-data'),
   },
   onLoad() {
     that = this;
@@ -30,6 +37,20 @@ Page({
   onShow() {
     this.getDb()
   },
+  openDataError(err) {
+    console.log(err);
+    this.setData({
+      errorInfo: JSON.stringify(err)
+    });
+    // switch err.code
+  },
+  openGly() {
+    contactAdminToUseApp({ id: '107002', corpId: that.data.mainCorpId })
+      .catch((err) => {
+        // 入参不正确，或者遇到技术异常时才会进入这个链路
+        console.error(err);
+      })
+  },
   returnS() {
     let str = "绩效主管理员"
     let role = this.data.role
@@ -67,25 +88,21 @@ Page({
     })
   },
   openUrl(e) {
-    // dd.chooseDingTalkDir({
+    // app.$get('api/drive/info').then(res => {
+    //   console.log(res.data.data.space_id.toString())
+    //   dd.uploadAttachmentToDingTalk({
+    //     space: { spaceId: res.data.data.space_id.toString(), isCopy: 1, max: 9 },
+    //     // space: { spaceId: '6200066562', isCopy: 1, max: 9 },
+    //     types: ["space"],//PC端仅支持["photo","file","space"]
     //     success: (res) => {
-    //         /* data结构
-    //         {"data":
-    //             [
-    //                 {
-    //                     "spaceId": "" //被选中的空间id
-    //                     "path": "", // 被选中的文件夹路径
-    //                     "dirId": "", //被选中的文件夹id
-    //                 }
-    //             ]
-    //         }
-    //       */
+    //         console.log(JSON.stringify(res));
     //     },
-    //     fail: (err) =>{
-    //         dd.alert({
-    //             content:JSON.stringify(err)
-    //         })
+    //     fail: (err) => {
+    //       dd.alert({
+    //         content: JSON.stringify(err)
+    //       })
     //     }
+    //   })
     // })
     // return false
     var url = e.target.dataset.url;

pages/home/participation/participation.axml

@@ -1,7 +1,7 @@
 <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 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">

pages/home/participation/participation.js

@@ -20,7 +20,7 @@ Page({
   },
   onLoad() {
     that = this;
-    dd.setNavigationBar({ title: "消息通知" });
+    dd.setNavigationBar({ title: "我参与的" });
     this.getRange();
   },
   onShow() {
@@ -29,7 +29,7 @@ Page({
       timeFunction: "linear",
     });
     if(this.data.page==1&&this.data.defaultRuleId){
-      this.getManagement();
+      this.data.tabIndex==1 ? this.getManagement():this.getScorerRecord()
     }
   },
   openDetail(e) {

pages/home/performanceDetails/performanceDetails.axml

@@ -1,5 +1,5 @@
 <view>
-  <view style="margin-bottom:3rem">
+  <view style="margin-bottom:3rem" class="{{popupCx}}">
     <!--<view  class="upDownList flex-box flex-d-center"><view class="uDownBut font-flex-word" a:for="{{headuDown}}"  data-item="{{item}}" onTap="uDownCli"><text a:if="{{!item.id}}" style="color: #a2a2a2;">已无待办</text><text a:else><text a:if="{{item.keys == 1}}">{{ item.keys2 }}</text>
           {{ item.keys1 }}：{{ item.name }}<text a:if="{{item.keys == 2}}">{{ item.keys2 }}</text></text></view></view> -->
     <view class="header">
@@ -109,7 +109,6 @@
         </view>
       </view>
     </view>
-    
     <!-- 记录 -->
     <view a:if="{{recordList.length > 0}}">
       <view class="modTit">记录</view>
@@ -195,6 +194,7 @@
       </view>
     </block>
   </view>
+
   <!-- 撤销 -->
   <view class="windows" a:if="{{isShowCx}}">
     <view class="windows-box">
@@ -237,7 +237,7 @@
             </view>
             <text class="iconfont icon-jiantouxia"></text>
         </view>
-        <textarea value="{{commFeedback}}" style="padding:0.24rem;height:3.8rem" maxlength="200" onInput="bindFeedback"  placeholder="{{popupknowFrom == 0
+        <textarea value="{{commFeedback}}" style="padding:0.24rem;height:3.4rem" maxlength="200" onInput="bindFeedback"  placeholder="{{popupknowFrom == 0
               ? '请输入沟通反馈（必填）'
               : popupknowFrom == 1
               ? '请输入驳回内容（必填）'
@@ -320,6 +320,12 @@
       <view class="windows-title">沟通</view>
       <view class="windows-content">
         <textarea value="{{textArea}}" onInput="bindTextAreaBlur" maxlength="200" style="height:3.6rem" placeholder="请输入沟通反馈（必填）" />
+        <view class="modTit flex-box-ce flex-d-center">
+          <label class="flex-box-ce">
+            <checkbox checked="{{ding_msg}}" onChange="onChangeC2"/>
+            <text class="checkbox-text">发送钉钉通知</text>
+          </label>
+        </view>
         <view class="aite" catchTap="openSelect" data-index='2'>
           <text class="blue" style="padding-right:6rpx">@</text>
           <text a:for="{{users}}">{{item.name}},</text>

pages/home/performanceDetails/performanceDetails.js

@@ -108,6 +108,8 @@ Page({
     isShowCx: false,
     checked: false,//是否查看更多
     isSuperior: false,//判断当前登录者是否是该考核人的上级
+    boxTop:0,
+    ding_msg: false,//判断当前登录者是否是该考核人的上级
   },
   onLoad(e) {
     that = this;
@@ -142,12 +144,24 @@ Page({
       }, function () { })
     }
   },
+  onPageScroll(e) {
+    if (e.scrollTop != 0) {
+      this.setData({
+        boxTop: e.scrollTop
+      })
+    }
+  },
   onChangeC(e) {
     this.setData({
       checked: e.detail.value
     })
     this.isShowOneself();
   },
+  onChangeC2(e) {
+    this.setData({
+      ding_msg: e.detail.value
+    })
+  },
   // 确认评分
   scorerveok(e) {
     let num = e.target.dataset.index
@@ -488,11 +502,16 @@ Page({
     app.$post('api/per/package/negotiation', {
       id: this.data.employeeID,
       content: this.data.textArea,
-      target_id: JSON.stringify(target_id)
+      target_id: JSON.stringify(target_id),
+	    ding_msg:this.data.ding_msg? 1:0
     }).then(res => {
       app.globalData.showToast('已沟通');
       this.employeeDet();
       this.showGt();
+      this.setData({
+        content:'',
+        ding_msg:false
+      })
     });
   },
   // 沟通@人员
@@ -587,6 +606,11 @@ Page({
       isShowstaff: false,
       popupCx: '',
     });
+    setTimeout(() => {
+      dd.pageScrollTo({
+        scrollTop: that.data.boxTop
+      })
+    }, 100)
   },
   openVas(e) {
     let index = e.target.dataset.index
@@ -695,7 +719,7 @@ Page({
     let item = this.data.rejectList[this.data.rejectListIndex]
     let rejectList1 = [];
     if (item.staff.length > 1) {
-      rejectList1.push({ employee_id: 0, employee_name: '全部人员' });
+      rejectList1.push({ employee_id: 0, employee_name: '选择人员' });
       item.staff.forEach(item => {
         if (item.status == 2) {
           rejectList1.push(item);

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">

pages/home/statementDetails/statementDetails.js

@@ -71,7 +71,6 @@ Page({
   }, 1000),
   openDetail(e){
       let item=e.target.dataset.item
-
       let str=`../performanceDetails/performanceDetails?assId=${this.data.nowAssList.id}&staffId=${item.employee_id}&tel=${this.data.nowAssList.name}`
       dd.navigateTo({
         url: str

pages/home/statistics/statistics.js

@@ -47,7 +47,7 @@ Page({
   onLoad() {
     that = this;
     chart1, chart2 = '';
-    dd.setNavigationBar({ title: "报表" });
+    dd.setNavigationBar({ title: "报表统计" });
     this.getRange();
   },
   onShow() {
@@ -331,7 +331,7 @@ Page({
         defaultRuleId: obj[0].id,
         jxName: obj[0].name,
       })
-	  this.statisticalPeople();
+	    this.statisticalPeople();
     })
   },
   onInitChart2(F2, config) {