Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_wechat

pages/apply/approval/approval.js

@@ -44,8 +44,8 @@ Page({
     ],
     //事务总表对象
     item:{},
-    detpId:187,
-    itemId:13,
+    detpId:"",
+    itemId:"",
     active:0,
     result:[],
     show:false,
@@ -64,7 +64,6 @@ Page({
    */
   onLoad(options) {
     this.setData({itemId:options.id,deptId:options.deptId});
-    console.log(options);
     //this.getApprovalItemList();
     this.groupList();
     this.townList();
@@ -252,7 +251,11 @@ Page({
         UTIL.httpRequest(API.URL_GET_USERLIST,d,{
           success: (res) => {
             if (res.code == API.SUCCESS_CODE) {
-              console.log(res);
+              res.rows.map(rr => {
+                rr.approvalLevel = 3
+                rr.approvalLevel = 1
+                rr.approvalOrder = 0
+              })
               _this.setData({towns:res.rows});
             }
           }
@@ -269,6 +272,11 @@ Page({
     UTIL.httpRequest(API.URL_GET_USERLIST,data ,{
       success: (res) => {
         if (res.code == API.SUCCESS_CODE) {
+          res.rows.map(rr => {
+            rr.approvalLevel = 2
+            rr.approvalLevel = 1
+            rr.approvalOrder = 0
+          })
           this.setData({groups:res.rows});
         }
       }
@@ -284,6 +292,11 @@ Page({
   UTIL.httpRequest(API.URL_GET_USERLIST,data ,{
     success: (res) => {
       if (res.code == API.SUCCESS_CODE) {
+        res.rows.map(rr => {
+          rr.approvalLevel = 1
+          rr.approvalLevel = 1
+          rr.approvalOrder = 0
+        })
         this.setData({villages:res.rows});
       }
     }
@@ -322,6 +335,7 @@ Page({
        let li = this.data.templateDetailList
         li = li.filter(function(e,i,s){
           s[i].name = i+1
+          s[i].approvalOrder = i+1
             return true
         })
       this.setData({templateDetailList:li})