20:19

app.json

@@ -1,8 +1,9 @@
 {
   "pages": [
     "pages/home/home",
-    "pages/corporateInfo/corporateInfo",
     "pages/approval/approval",
+    "pages/applyjoinapprovel/applyjoinapprovel",
+    "pages/corporateInfo/corporateInfo",
     "pages/point/point",
     "pages/minusapply/minusapply",
     "pages/selectStaff/selectStaff",
@@ -10,7 +11,6 @@
     "pages/selectnorm/selectnorm",
     "pages/perinfo/perinfo",
     "pages/bindphone/bindphone",
-    "pages/applyjoinapprovel/applyjoinapprovel",
     "pages/mine/mine"
   ],
   "window": {

pages/applyjoinapprovel/applyjoinapprovel.js

@@ -10,13 +10,22 @@ Page({
    * 页面的初始数据
    */
   data: {
-    approvelStatus:0,//单据账套 0：待审批，1：已审批，2：我发起的
+    approvelStatus:1,//单据账套 0：待审批，1：已审批，2：我发起的
     applyName:'吴彦祖',
     applyPhone:'18130506086',
     enterDate:'2016-06-12',
     birthDate:'2006-06-12',
     applyMail:'18130506086@163.com',
-    companyName:'优软科技'
+    companyName:'优软科技',
+    isapplyPoint:true, //积分审批
+
+    applyStatus:'待审批',
+    applyTime: '2018-10-14',
+    applyJob: '程序猿',
+    applyNorm: '标准1',
+    applyPoint:'',
+    fromType:1,
+    isISend:false
   },
 
   /**
@@ -24,20 +33,101 @@ Page({
    */
   onLoad: function (options) {
     var that = this
-    var approvelStatus = options.getapprovelStatus
-    console.log('approvelStatus=', approvelStatus)
-    that.setData({
-      approvelStatus: approvelStatus
+    var Itemdata = options.getItemdata
+    var approvelStatus = JSON.parse(Itemdata).invoicesStatus
+    var invoicesId = JSON.parse(Itemdata).invoicesId
+    var fromType = options.getfromType
+    var isISend
+    console.log('fromType=', fromType)
+    var title
+    if (Itemdata){
+      console.log('Itemdata=', JSON.parse(Itemdata))
+      // console.log('approvelStatus=', approvelStatus)
+      title = fromType == 1 ? '待审批' : (fromType == 2 ? '已审批' : '我发起的')
+      isISend = fromType == 3 ? true : false
+      
+      that.setData({
+        approvelStatus: approvelStatus,
+        invoicesId: invoicesId,
+        fromType: fromType,
+        isISend: isISend
+        // applyStatus: approvelStatus == 
+      })
+
+     
+      wx.setNavigationBarTitle({
+        title: title
+      })
+      that.initDetailsView(invoicesId)
+    }
+  },
+  /**
+   * 根据invoicesId 获取加分单据详情数据
+   */
+  initDetailsView: function (invoicesId) {
+    var that = this
+    var data = { invoicesId: invoicesId }
+    var url = baseUrl + BASEURL.getUrl.getInvoices
+    netUtil.requestLoading(url, data, '正在加载数据...', 'GET', function (res) {
+      if (res.data.success && res.data.data) {
+        that.setData({
+          applyTime: res.data.data.invoicesDate,
+          applyName: res.data.data.fillName,
+          applyJob: res.data.data.fillStation,
+          applyNorm: res.data.data.normName,
+          applyReason: res.data.data.reasons,
+          applyPoint: res.data.data.score,
+          adviceName: res.data.data.adviceName,
+
+        })
+      }
+    }, function (res) {
+      wx.showToast({
+        title: '加载数据失败',
+        icon: 'none',
+        duration: 2000
+      })
     })
   },
-
   agreeBtnClick:function(){
-
+    this.doApprovel(1)
   },
 
   disagreeBtnClick:function(){
+    this.doApprovel(2)
 
   },
+  doApprovel: function (status){
+    var that = this
+    var data = { status: status, invoicesId: that.data.invoicesId }
+    var url = baseUrl + BASEURL.getUrl.approval
+    netUtil.requestLoading(url, data, '正在加载数据...', 'GET', function (res) {
+      if(res.data.success && res.data.data){
+        that.comToast(res.data.data)
+        setTimeout(function () {
+          wx.navigateBack({
+          })
+        }, 1000)
+      }else{
+        that.comToast(res.data.data)
+      }
+    }, function (res) {
+      wx.showToast({
+        title: '加载数据失败',
+        icon: 'none',
+        duration: 2000
+      })
+    })
+  },
+
+
+  comToast: function (title) {
+    wx.showToast({
+      title: title,
+      icon: 'none',
+      duration: 2000
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/applyjoinapprovel/applyjoinapprovel.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "申请加入审批"
+  "navigationBarTitleText": ""
 }

pages/applyjoinapprovel/applyjoinapprovel.wxml

@@ -1,65 +1,151 @@
-<view class='commonHview'>
-  <view class='left_sty'>
-    申请人
-  </view>
-   <view class='right_sty'>
-        <input class='input_sty'  type='text'  name='applyName' value='{{applyName}}' disabled='true'></input>
+<!-- 加积分申请单据审批 -->
+<view wx:if='{{!isapplyPoint && !isISend}}'>
+    <view class='commonHview' wx:if='{{isapplyPoint}}'>
+      <view class='left_sty'> 申请人 </view>
+      <view class='right_sty'>{{applyName}}</view>
     </view>
-</view>
-<view class='commonhline' style='height:3rpx;'></view>
+    <view class='commonhline' style='height:3rpx;'></view>
 
+    <view class='commonHview'>
+      <view class='left_sty'>申请手机号</view>
+      <view class='right_sty'>{{applyPhone}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
 
-<view class='commonHview'>
-  <view class='left_sty'>
-    申请手机号
-  </view>
-   <view class='right_sty'>
-        <input class='input_sty'  type='text'  name='applyPhone' value='{{applyPhone}}' disabled='true'></input>
+    <view class='commonHview'>
+      <view class='left_sty'>入职日期</view>
+      <view class='right_sty'>{{enterDate}}</view>
     </view>
-</view>
-<view class='commonhline' style='height:3rpx;'></view>
+    <view class='commonhline' style='height:3rpx;'></view>
 
-<view class='commonHview'>
-  <view class='left_sty'>
-    入职日期
-  </view>
-   <view class='right_sty'>
-        <input class='input_sty'  type='text'  name='enterDate' value='{{enterDate}}' disabled='true'></input>
+    <view class='commonHview'>
+      <view class='left_sty'>出生日期</view>
+      <view class='right_sty'>{{birthDate}}</view>
     </view>
-</view>
-<view class='commonhline' style='height:3rpx;'></view>
+    <view class='commonhline' style='height:3rpx;'></view>
+
+    <view class='commonHview'>
+      <view class='left_sty'>邮箱</view>
+      <view class='right_sty'>{{applyMail}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
 
-<view class='commonHview'>
-  <view class='left_sty'>
-    出生日期
-  </view>
-   <view class='right_sty'>
-        <input class='input_sty'  type='text'  name='birthDate' value='{{birthDate}}' disabled='true'></input>
+    <view class='commonHview'>
+      <view class='left_sty'> 加入公司</view>
+      <view class='right_sty'>{{companyName}}</view>
     </view>
+  <view class='commonhline' style='height:3rpx;'></view>
 </view>
-<view class='commonhline' style='height:3rpx;'></view>
 
-<view class='commonHview'>
-  <view class='left_sty'>
-    邮箱
-  </view>
-   <view class='right_sty'>
-        <input class='input_sty'  type='text'  name='applyMail' value='{{applyMail}}' disabled='true'></input>
+
+
+<!-- 申请注册审批 -->
+<view wx:if='{{isapplyPoint && !isISend}}'>
+    <view class='commonHview' >
+      <view class='left_sty'>状态</view>
+      <view class='right_sty'>{{applyStatus}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+
+    <view class='commonHview'>
+      <view class='left_sty'>申请时间</view>
+      <view class='right_sty'>{{applyTime}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+
+
+    <view class='commonHview'>
+      <view class='left_sty'>申请人</view>
+      <view class='right_sty'>{{applyName}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+
+
+    <view class='commonHview'>
+      <view class='left_sty'>申请人岗位</view>
+      <view class='right_sty'>{{applyJob}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+
+
+    <view class='commonHview'>
+      <view class='left_sty' style='height:auto;min-height:100rxp;' >申请标准</view>
+      <view class='right_sty' style='height:auto;min-height:100rxp;'>{{applyNorm}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+
+
+    <view class='commonHview'>
+      <view class='left_sty' style='width: 10%;'>事由</view>
+      <view class='righttextarea' > {{applyReason}} </view>
     </view>
+<view class='commonhline' style='height:20rpx;'></view>
+    <view class='commonHview'>
+      <view class='left_sty'>加分数量</view>
+      <view class='right_sty'>{{applyPoint}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
 </view>
-<view class='commonhline' style='height:3rpx;'></view>
 
-<view class='commonHview'>
-  <view class='left_sty'>
-    加入公司
-  </view>
-   <view class='right_sty'>
-        <input class='input_sty'  type='text'  name='companyName' value='{{companyName}}' disabled='true'></input>
+
+<!-- 我发起的 -->
+<view wx:if='{{isapplyPoint &&  isISend }}'>
+    <view class='commonHview' >
+      <view class='left_sty'>状态</view>
+      <view class='right_sty'>{{applyStatus}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+
+    <view class='commonHview' >
+      <view class='left_sty'>待审批人</view>
+      <view class='right_sty'>{{adviceName}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+
+
+    <view class='commonHview'>
+      <view class='left_sty'>申请时间</view>
+      <view class='right_sty'>{{applyTime}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+
+
+    <view class='commonHview'>
+      <view class='left_sty'>申请人</view>
+      <view class='right_sty'>{{applyName}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+
+
+    <view class='commonHview'>
+      <view class='left_sty'>申请人岗位</view>
+      <view class='right_sty'>{{applyJob}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+
+
+    <view class='commonHview'>
+      <view class='left_sty' style='height:auto;min-height:100rxp;' >申请标准</view>
+      <view class='right_sty' style='height:auto;min-height:100rxp;'>{{applyNorm}}</view>
     </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+
+
+    <view class='commonHview'>
+      <view class='left_sty' style='width: 10%;'>事由</view>
+      <view class='righttextarea' > {{applyReason}} </view>
+    </view>
+<view class='commonhline' style='height:20rpx;'></view>
+    <view class='commonHview'>
+      <view class='left_sty'>加分数量</view>
+      <view class='right_sty'>{{applyPoint}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
 </view>
-<view class='commonhline' style='height:3rpx;'></view>
 
-<view class='commonHview' style='margin-top:400rpx;' wx:if='{{approvelStatus == 0}}'>
-    <button  class='comBtn' style='background-color: #3C85EC;color:#FFF;' formType="submit" hover-class="commonclick-btn" bindtap='agreeBtnClick'>同意</button>
-    <button  class='comBtn' formType="submit" hover-class="commonclick-btn" bindtap='disagreeBtnClick'>不同意</button>
-</view>
+
+
+    <view wx:if='{{approvelStatus == 1 && fromType == 1}}' class='commonHview' style='margin-top:100rpx;'>
+      <button  class='comBtn' style='background-color: #3C85EC;color:#FFF;' formType="submit" hover-class="commonclick-btn" bindtap='agreeBtnClick'>同意</button>
+      <button  class='comBtn' formType="submit" hover-class="commonclick-btn" bindtap='disagreeBtnClick'>不同意</button>
+    </view>

pages/applyjoinapprovel/applyjoinapprovel.wxss

@@ -1,8 +1,25 @@
+
+
 .left_sty{
   width: 50%;height: 100rpx;text-align: left;color: #333333;font-size: 30rpx;line-height: 100rpx;margin-left: 20rpx;
 }
 .right_sty{
   width: 50%;height: 100rpx;text-align: right;color: #666666;font-size: 30rpx;line-height: 100rpx;margin-right: 20rpx;
-}.input_sty{
+}
+.right_sty1{
+ height: 100rpx;color: #666666;font-size: 30rpx;padding-top: 20rpx;width: 70%;text-align: right;
+  line-height: 50rpx; 
+}
+.input_sty{
   margin-top: 20rpx;
+}
+.righttextarea{
+   width:200rpx;
+  font-size: 30rpx;
+  margin: 30rpx;
+  text-align: left;color: #666666;height: 300rpx;
+}.nextImg{
+  width: 20rpx;
+  height: 30rpx;
+  text-align: right;margin:30rpx 20rpx;
 }

pages/approval/approval.js

@@ -10,10 +10,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    allorders: [],
-    todayorders: [1],
-    weekorders: [1, 2, 3],
-    monthorders: [1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4],
+
     // tab切换  
     currentTab: 0,
     clientHeight: '',
@@ -23,6 +20,10 @@ Page({
       */
     winWidth: 0,
     winHeight: 0,
+    already:[],
+    wait:[],
+    fill:[],
+    fromType:'1'
   },
 
   /**
@@ -52,7 +53,13 @@ Page({
     }
     var url = baseUrl + BASEURL.getUrl.getAllApproval
     netUtil.requestLoading(url, data, '正在加载数据...', 'GET', function (res) {
-
+      if(res.data.success && res.data.data){
+        that.setData({
+          already: res.data.data.already,
+          wait: res.data.data.wait,
+          fill: res.data.data.fill
+        })
+      }
     }, function (res) {
       wx.showToast({
         title: '加载数据失败',
@@ -61,14 +68,12 @@ Page({
       })
     })
   },
-  waitApproItemClick:function(){
-    wx.navigateTo({
-      url: '../applyjoinapprovel/applyjoinapprovel?getapprovelStatus='+0,
-    })
-  },
-  ApprovaledClick:function(){
+  ApprovaledClick:function(event){
+    var itemdata = event.currentTarget.dataset.item
+    var fromtype = event.currentTarget.dataset.fromtype
+    console.log('event', event)
     wx.navigateTo({
-      url: '../applyjoinapprovel/applyjoinapprovel?getapprovelStatus=' + 1,
+      url: '../applyjoinapprovel/applyjoinapprovel' + '?getItemdata=' + JSON.stringify(itemdata) + '&getfromType=' + fromtype,
     })
   },
   getHisOrderData: function () {
@@ -103,7 +108,7 @@ Page({
    */
   swichNav: function (e) {
     var that = this;
-    console.log('swichNav=', e)
+    // console.log('swichNav=', e)
     if (this.data.currentTab == e.target.dataset.current) {
       return false;
     } else {

pages/approval/approval.wxml

@@ -4,57 +4,70 @@
     <view class="swiper-tab-list {{currentTab==2 ? 'on' : ''}}" data-current="2" bindtap="swichNav">我发起的</view>  
 </view>  
 
- <view wx:if='{{(currentTab == 1 && todayorders.length == 0) || (currentTab == 2 && weekorders.length == 0) || (currentTab == 0 && monthorders.length == 0)}}' class='nodata_view'>
-     <view><image class='nodata_style' src='../../resource/images/common_nodata.png'></image></view> 
+ <view wx:if='{{(currentTab == 0 && wait.length == 0) || (currentTab == 1 && already.length == 0) || (currentTab == 2 && fill.length == 0)}}' class='nodata_view'>
+     <view><image class='nodata_style' src='../../img/common_nodata.png'></image></view> 
 </view> 
 
 <swiper current="{{currentTab}}" class="swiper-box" duWration="300" style="height:{{winHeight-31}}px;margin:85rpx 0 0 0;" bindchange="bindChange">
       <swiper-item>  
       <scroll-view  scroll-y="true" style="height:100%;">
-      <block wx:for='{{todayorders}}'  >
+      <view wx:for='{{wait}}' bindtap='ApprovaledClick' data-item='{{item}}'  data-fromtype='{{1}}'>
          <template is='waitApproval' data='{{...item}}' /> 
-      </block>
+      </view>
      </scroll-view> 
     </swiper-item> 
 
       <swiper-item>  
       <scroll-view  scroll-y="true" style="height:100%;">
-      <block wx:for='{{weekorders}}'>
+      <view wx:for='{{already}}' bindtap='ApprovaledClick' data-item='{{item}}' data-fromtype='{{2}}'>
          <template is='Approvaled' data='{{...item}}'/> 
-      </block>
+      </view>
      </scroll-view> 
     </swiper-item> 
 
       <swiper-item >  
       <scroll-view  scroll-y="true" style="height:100%;">
-      <block wx:for='{{monthorders}}'>
-         <template is='waitApproval' data='{{...item}}'/> 
-      </block>
+      <view wx:for='{{fill}}'  bindtap='ApprovaledClick' data-item='{{item}}' data-fromtype='{{3}}'>
+         <template is='isendApproval' data='{{...item}}'/> 
+      </view>
      </scroll-view> 
     </swiper-item> 
 </swiper>
 
 
 <template name='waitApproval'>
-  <view class='commonHview itemRow' bindtap='waitApproItemClick'>
+  <view class='commonHview itemRow' >
         <view><image src='../../img/common_header_boy.png' class='img1'></image></view>
         <view class='commonVview itemMsg'>
-          <view style='font-size:30rpx;margin-top:10rpx;'>陈冠希的积分申报</view>
-          <view style='color:#999999;font-size:24rpx;margin-top:20rpx;'>等待古天乐审批</view>
+          <view style='font-size:30rpx;margin-top:10rpx;'>{{fillName}}的积分申报</view>
+          <view style='color:#999999;font-size:24rpx;margin-top:20rpx;'>等待您的审批</view>
         </view>
-        <view class='itemStatue_finish'>2018-09-19</view>
+        <view class='itemStatue_finish'>{{invoicesDate}}</view>
         </view>
         <view class='commonhline' style='height:3rpx;'></view>
 </template>
 
 <template name='Approvaled'>
-  <view class='commonHview itemRow' bindtap='ApprovaledClick'>
+  <view class='commonHview itemRow' >
         <view><image src='../../img/common_header_boy.png' class='img1'></image></view>
         <view class='commonVview itemMsg'>
-          <view style='font-size:30rpx;margin-top:10rpx;'>陈冠希的积分申报</view>
+          <view style='font-size:30rpx;margin-top:10rpx;'>{{fillName}}的积分申报</view>
           <view style='color:#999999;font-size:24rpx;margin-top:20rpx;'>已审批</view>
         </view>
-        <view class='itemStatue_finish'>2018-09-19</view>
+        <view class='itemStatue_finish'>{{approvalDate}}</view>
+  </view>
+        <view class='commonhline' style='height:3rpx;'></view>
+</template>
+
+
+<template name='isendApproval'>
+  <view class='commonHview itemRow' >
+        <view><image src='../../img/common_header_boy.png' class='img1'></image></view>
+        <view class='commonVview itemMsg'>
+          <view style='font-size:30rpx;margin-top:10rpx;'>{{fillName}}的积分申报</view>
+          <view style='color:#999999;font-size:24rpx;margin-top:20rpx;'>等待{{adviceName}}审批</view>
+        </view>
+        <view class='itemStatue_finish'>{{invoicesDate}}</view>
         </view>
         <view class='commonhline' style='height:3rpx;'></view>
 </template>

pages/approval/approval.wxss

@@ -18,11 +18,11 @@
 .swiper-box{ display: block; height: 100%; width: 100%; overflow: hidden; } 
 .img1{height: 120rpx;width: 120rpx;border-radius: 10rpx;}
 .itemRow{
-  padding: 10rpx 20rpx;width: 100%;height:140rpx;
+  padding: 10rpx 0rpx 0rpx 20rpx;width: 100%;height:140rpx;
 }
 .itemMsg{
-  font-size: 30rpx;margin-left: 10rpx;text-align: left;width: 60%;
+  font-size: 30rpx;margin-left: 10rpx;text-align: left;width: 40%;
 }
 .itemStatue_finish{
-  font-size: 24rpx;text-align: right;color: #666666;
+  font-size: 24rpx;text-align: right;color: #666666;margin-top: 10rpx;
 }

pages/home/home.js

@@ -3,6 +3,7 @@ var BASEURL = require('../../utils/wxconstant.js')
 var baseUrl = BASEURL.BaseUrl()
 var baseutils = require('../../utils/baseUtils.js')
 var netUtil = require('../../utils/network.js')
+var openid = wx.getStorageSync('openid')
 
 Page({
 
@@ -38,7 +39,7 @@ Page({
 
   getAddata:function(){
     var that = this
-    var data = { openid: wx.getStorageSync('openid') }
+    var data = {  }
     var url = baseUrl + BASEURL.getUrl.getAd
     netUtil.requestLoading(url, data, '正在加载数据...', 'GET', function (res) {
       if (res.data.success){
@@ -71,9 +72,26 @@ Page({
    */
   onShow: function () {
     var that = this
-    baseutils.getComOpenid() //获取openid
-    baseutils.getPersonlEmp()
-    baseutils.judgeisReg()
+    if (openid){
+      baseutils.getComOpenid() //获取openid
+      baseutils.getPersonlEmp()
+      baseutils.judgeisReg()
+    }else{
+      wx.showModal({
+        title: '提示',
+        content: '您当前尚未进行微信授权登录，是否立即前往?',
+        success: function (res) {
+          if (res.confirm) {
+            wx.switchTab({
+              url: '../mine/mine',
+            })
+          } else if (res.cancel) {
+            return
+          }
+        }
+      })
+    }
+   
 
     that.getAddata()   //获取home广告信息
   },

pages/mine/mine.js

@@ -129,6 +129,11 @@ Page({
     var city = userInfo.city
     var country = userInfo.country
     if (nickName && avatarUrl) {
+      
+      baseutils.getComOpenid() //获取openid
+      baseutils.getPersonlEmp()
+      baseutils.judgeisReg()
+
       that.setData({
         wxNickname: nickName,
         wxHeader: avatarUrl,

pages/mine/mine.wxml

@@ -53,9 +53,4 @@
   </view>
  <view class='commonhline' style='height:3rpx;'></view>
 
-
-
-
-
-
 </view>

pages/selectnorm/selectnorm.js

@@ -40,11 +40,12 @@ Page({
       // console.log('res='+JSON.stringify(res))
       if(res.data.success && res.data.data){
         var rightnorm = []
-        if (isAddType == true){
+        if (isAddType == 'true'){
           rightnorm = res.data.data[0].typedata.addnorm
         }else{
           rightnorm = res.data.data[0].typedata.minus
         }
+        console.log('rightnorm=', rightnorm)
         that.setData({
           NormData: res.data.data,
           curName: res.data.data[0].typeName,

utils/wxconstant.js

@@ -27,7 +27,7 @@ const getUrl = {
   getNormByCategoryId: 'inte/norm/getNormByCategoryId', //获取分类下相应的规章制度
   getInvoices: 'inte/invoices/getInvoices', //获取提交的单据详情  
   withdrawInvoices: 'inte/invoices/withdrawInvoices', //撤回未审批的  
-  
+  approval: 'inte/invoices/approval', //审批  
 }
 module.exports = {
   BaseUrl: BaseUrl,