zhaoxiaohai 3 лет назад
Родитель
Сommit
3b7693acc6

+ 3 - 3
packageA/contract/add/type4/index.js

@@ -65,15 +65,15 @@ Page({
             checking: "base",
             required: true
         }, {
-            label: "佣金比例(%)",
+            label: "订单金额比例",
             error: false,
             errMsg: "",
             hint: "请输入0-100整数!",
             type: "number",
             value: "",
-            placeholder: "请填写佣金比例(%)",
+            placeholder: "请填写订单金额比例(%)",
             valueName: "kickback", //绑定的字段名称
-            required: false, //必填
+            required: true, //必填
             checking: `^([1-9]?\\d|100)$`, //0-100%
             slot: "discountrate"
         }, {

+ 2 - 2
packageA/contract/detail.js

@@ -229,7 +229,7 @@ Page({
                         value: data.projectname
                     })
                     briefs.splice(5, 0, {
-                        label: "佣金比例",
+                        label: "订单金额比例",
                         value: data.kickback + '%'
                     })
                     list1.splice(4, 0, {
@@ -241,7 +241,7 @@ Page({
                         value: data.projectname
                     })
                     list1.splice(8, 0, {
-                        label: "佣金比例",
+                        label: "订单金额比例",
                         value: data.kickback + '%'
                     })
                     break;

+ 9 - 15
packageA/publicClue/detail.js

@@ -21,20 +21,15 @@ Page({
             num: 132
         }],
         tabbarList: [{
-                icon: "icon-bianji",
-                label: "编辑"
-            }, {
-                icon: "icon-zhuanyi",
-                label: "分配"
-            }, {
-                icon: "icon-dibu-tuihui",
-                label: "撤回"
-            },
-            {
-                icon: "icon-dibu-jieshu",
-                label: "作废"
-            }
-        ],
+            icon: "icon-bianji",
+            label: "编辑"
+        }, {
+            icon: "icon-zhuanyi",
+            label: "分配"
+        }, {
+            icon: "icon-dibu-jieshu",
+            label: "作废"
+        }],
     },
     onLoad(options) {
         this.setData({
@@ -159,7 +154,6 @@ Page({
                     return item.label != '编辑' && item.label != '撤回'
                 })
             }
-
             /* 更新列表中状态 */
             let page = getCurrentPages().find(v => v.__route__ == 'packageA/publicClue/index');
             if (page) {

+ 20 - 14
pages/tabbar/home/index.js

@@ -34,7 +34,7 @@ Page({
         })
         /* 首页宫格授权查询 */
         if (wx.getStorageSync('userauth').length != 0) {
-            let auth = getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['营销工具'], ['通告', '推广素材', '商学院', '提报', '销售线索', '营销物料', '销售目标', '客户管理', '项目管理', '销售预测']),
+            let auth = getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['营销工具'], ['通告', '推广素材', '商学院', '提报', '销售线索', '营销物料', '销售目标', '客户管理', '项目管理', '销售预测', '合同管理']),
                 gridList = [],
                 subassembly = [];
             console.log(auth)
@@ -175,19 +175,6 @@ Page({
                                         optionnames: value.meta.auth.map(a => a.optionname),
                                     }
                                     break;
-                                    //合同
-                                case "wcontract":
-                                    if (value.meta.auth.some(r => r.option == 'read')) gridList.push({
-                                        name: "合同",
-                                        path: "/packageA/contract/index",
-                                        icon: "icon-hetong",
-                                        apps: {}
-                                    })
-                                    getApp().globalData.auth.wcontract = {
-                                        options: value.meta.auth.map(a => a.option),
-                                        optionnames: value.meta.auth.map(a => a.optionname),
-                                    }
-                                    break;
                             };
                         });
                         break;
@@ -264,6 +251,25 @@ Page({
                             };
                         });
                         break;
+                    case "合同管理":
+                        v.apps.forEach(value => {
+                            switch (value.name) {
+                                //合同
+                                case "wcontract":
+                                    if (value.meta.auth.some(r => r.option == 'read')) gridList.push({
+                                        name: "合同",
+                                        path: "/packageA/contract/index",
+                                        icon: "icon-hetong",
+                                        apps: {}
+                                    })
+                                    getApp().globalData.auth.wcontract = {
+                                        options: value.meta.auth.map(a => a.option),
+                                        optionnames: value.meta.auth.map(a => a.optionname),
+                                    }
+                                    break;
+                            }
+                        })
+                        break;
                     default:
                         console.log(v);
                         break;