Merge branch 'master' into 绿色

packageA/achievement/index.js

@@ -7,14 +7,8 @@ const _Http = getApp().globalData.http,
 Page({
   data: {
     dropdownItem: 0,
-
     filtratelist: [],
     showFiltrate: false,
-    active: {
-      name: wx.getStorageSync('userMsg').name,
-      userid: wx.getStorageSync('userMsg').userid,
-      isleave: 1
-    }
   },
   onLoad(options) {
     this.refreshData();
@@ -40,7 +34,12 @@ Page({
           text: getApp().globalData.Language.getMapText('作业单据'),
           value: 4
         }
-      ]
+      ],
+      active: {
+        name: wx.getStorageSync('userMsg').name,
+        userid: wx.getStorageSync('userMsg').userid,
+        isleave: 1
+      }
     })
   },
   openFiltrate() {

packageA/public/discuss/index.js

@@ -22,12 +22,14 @@ Component({
             total: null
         },
         list: [],
-        userid: wx.getStorageSync('userMsg').userid,
         replyid: 0,
     },
     lifetimes: {
         attached: function () {
             getApp().globalData.Language.getLanguagePackage(this)
+            this.setData({
+                userid: wx.getStorageSync('userMsg').userid,
+            })
         }
     },
     methods: {

packageA/saleClue/translate.js

@@ -21,180 +21,6 @@ Page({
         repetitionShow: false,
         repetitionList: [],
         isSubmit: false,
-        form: [{
-            label: "客户(企业)",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "客户(企业)名称",
-            valueName: "enterprisename",
-            checking: "base",
-            slot: "info",
-            required: true
-        }, {
-            label: "企业简称",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "企业简称",
-            valueName: "abbreviation",
-            checking: "base",
-            required: false
-        }, {
-            label: "客户类型",
-            error: false,
-            errMsg: "",
-            type: "option",
-            optionNmae: "customertypemx",
-            optionType: "radio", //复选   radio 单选
-            value: "",
-            placeholder: "客户类型",
-            valueName: "type",
-            checking: "base",
-            required: true
-        }, {
-            label: "客户分类",
-            error: false,
-            errMsg: "",
-            type: "option",
-            optionNmae: "customergrade",
-            optionType: "radio", //复选   radio 单选
-            value: "",
-            placeholder: "客户分类",
-            valueName: "customergrade",
-            checking: "base",
-            required: false
-        }, {
-            label: "客户行业",
-            error: false,
-            errMsg: "",
-            type: "option", //自定义选择  配合预定接口
-            optionNmae: "industry", //选择类型
-            optionType: "checkbox", //复选   radio 单选
-            value: "",
-            placeholder: "客户所属行业",
-            valueName: "industry",
-            checking: "base",
-            required: false
-        }, {
-            label: "税号",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "企业税号",
-            valueName: "taxno",
-            checking: "base",
-            required: false
-        }, {
-            label: "法人",
-            error: false,
-            errMsg: "",
-            type: "text",
-            value: "",
-            placeholder: "企业法人",
-            valueName: "contact",
-            checking: "base",
-            required: false
-        }, {
-            label: "联系电话",
-            error: false,
-            errMsg: "",
-            type: "number",
-            value: "",
-            placeholder: "联系电话",
-            valueName: "phonenumber",
-            required: false
-        }, {
-            label: "省市县",
-            error: false,
-            errMsg: "",
-            type: "region",
-            value: [],
-            placeholder: "所在地区",
-            valueName: "region",
-            required: true
-        }, {
-            label: "详细地址",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "详细地址",
-            valueName: "address",
-            checking: "base",
-            required: false
-        }, {
-            label: "上级企业",
-            error: false,
-            errMsg: "",
-            type: "route",
-            url: "/packageA/select/setclient/select",
-            value: "",
-            params: {
-                id: 20221012164402,
-                content: {
-                    nocache: true,
-                    "type": 1,
-                    "isExport": 0,
-                    isend: 0,
-                    "where": {
-                        "condition": "",
-                        "status": "", //状态
-                        "startdate": "",
-                        "enddate": ""
-                    },
-                    "sort": [{
-                        sortname: "默认",
-                        sorted: 1,
-                        sortid: 67,
-                        reversed: 0
-                    }]
-                },
-            },
-            query: "&radio=true&idname=sa_customersid",
-            placeholder: "选择上级企业",
-            valueName: "parentid",
-            checking: "base",
-            required: false
-        }, {
-            label: "客户来源",
-            error: false,
-            errMsg: "",
-            type: "selector",
-            range: [],
-            rangeKey: "name",
-            selectKey: "value",
-            rangeIndex: "",
-            value: "",
-            placeholder: "来源",
-            valueName: "source",
-            checking: "base",
-            required: true
-        }, {
-            label: "归属经销商",
-            error: false,
-            errMsg: "",
-            type: "route",
-            url: "/packageA/select/setclient/select",
-            value: "",
-            params: {
-                "id": 20230214162602,
-                "content": {
-                    "hrid": wx.getStorageSync('userMsg').hrid,
-                    "where": {
-                        "condition": ""
-                    }
-                },
-            },
-            query: "&radio=true&idname=sa_agentsid",
-            placeholder: "归属经销商",
-            valueName: "sa_agentsid",
-            checking: "base",
-            required: false
-        }],
         content: {},
         disabled: true,
         countDown: "", //查重倒计时
@@ -377,7 +203,180 @@ Page({
              } */
 
 
-            let form = this.data.form.map(v => {
+            let form = [{
+                label: "客户(企业)",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "客户(企业)名称",
+                valueName: "enterprisename",
+                checking: "base",
+                slot: "info",
+                required: true
+            }, {
+                label: "企业简称",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "企业简称",
+                valueName: "abbreviation",
+                checking: "base",
+                required: false
+            }, {
+                label: "客户类型",
+                error: false,
+                errMsg: "",
+                type: "option",
+                optionNmae: "customertypemx",
+                optionType: "radio", //复选   radio 单选
+                value: "",
+                placeholder: "客户类型",
+                valueName: "type",
+                checking: "base",
+                required: true
+            }, {
+                label: "客户分类",
+                error: false,
+                errMsg: "",
+                type: "option",
+                optionNmae: "customergrade",
+                optionType: "radio", //复选   radio 单选
+                value: "",
+                placeholder: "客户分类",
+                valueName: "customergrade",
+                checking: "base",
+                required: false
+            }, {
+                label: "客户行业",
+                error: false,
+                errMsg: "",
+                type: "option", //自定义选择  配合预定接口
+                optionNmae: "industry", //选择类型
+                optionType: "checkbox", //复选   radio 单选
+                value: "",
+                placeholder: "客户所属行业",
+                valueName: "industry",
+                checking: "base",
+                required: false
+            }, {
+                label: "税号",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "企业税号",
+                valueName: "taxno",
+                checking: "base",
+                required: false
+            }, {
+                label: "法人",
+                error: false,
+                errMsg: "",
+                type: "text",
+                value: "",
+                placeholder: "企业法人",
+                valueName: "contact",
+                checking: "base",
+                required: false
+            }, {
+                label: "联系电话",
+                error: false,
+                errMsg: "",
+                type: "number",
+                value: "",
+                placeholder: "联系电话",
+                valueName: "phonenumber",
+                required: false
+            }, {
+                label: "省市县",
+                error: false,
+                errMsg: "",
+                type: "region",
+                value: [],
+                placeholder: "所在地区",
+                valueName: "region",
+                required: true
+            }, {
+                label: "详细地址",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "详细地址",
+                valueName: "address",
+                checking: "base",
+                required: false
+            }, {
+                label: "上级企业",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/setclient/select",
+                value: "",
+                params: {
+                    id: 20221012164402,
+                    content: {
+                        nocache: true,
+                        "type": 1,
+                        "isExport": 0,
+                        isend: 0,
+                        "where": {
+                            "condition": "",
+                            "status": "", //状态
+                            "startdate": "",
+                            "enddate": ""
+                        },
+                        "sort": [{
+                            sortname: "默认",
+                            sorted: 1,
+                            sortid: 67,
+                            reversed: 0
+                        }]
+                    },
+                },
+                query: "&radio=true&idname=sa_customersid",
+                placeholder: "选择上级企业",
+                valueName: "parentid",
+                checking: "base",
+                required: false
+            }, {
+                label: "客户来源",
+                error: false,
+                errMsg: "",
+                type: "selector",
+                range: [],
+                rangeKey: "name",
+                selectKey: "value",
+                rangeIndex: "",
+                value: "",
+                placeholder: "来源",
+                valueName: "source",
+                checking: "base",
+                required: true
+            }, {
+                label: "归属经销商",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/setclient/select",
+                value: "",
+                params: {
+                    "id": 20230214162602,
+                    "content": {
+                        "hrid": wx.getStorageSync('userMsg').hrid,
+                        "where": {
+                            "condition": ""
+                        }
+                    },
+                },
+                query: "&radio=true&idname=sa_agentsid",
+                placeholder: "归属经销商",
+                valueName: "sa_agentsid",
+                checking: "base",
+                required: false
+            }].map(v => {
                 if (v.valueName == 'enterprisename') {
                     v.value = data.enterprisename_customer;
                 } else if (v.valueName != 'region') {

packageA/setclient/addAndEditor.js

@@ -24,180 +24,6 @@ Page({
         isSubmit: false,
         oldcontactsid: 0,
         sys_phonebookid: 0,
-        form: [{
-            label: "客户(企业)",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "客户(企业)名称",
-            valueName: "enterprisename",
-            checking: "base",
-            slot: "info",
-            required: true
-        }, {
-            label: "企业简称",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "企业简称",
-            valueName: "abbreviation",
-            checking: "base",
-            required: false
-        }, {
-            label: "客户类型",
-            error: false,
-            errMsg: "",
-            type: "option",
-            optionNmae: "customertypemx",
-            optionType: "radio", //复选   radio 单选
-            value: "",
-            placeholder: "客户类型",
-            valueName: "type",
-            checking: "base",
-            required: true
-        }, {
-            label: "客户分类",
-            error: false,
-            errMsg: "",
-            type: "option",
-            optionNmae: "customergrade",
-            optionType: "radio", //复选   radio 单选
-            value: "",
-            placeholder: "客户分类",
-            valueName: "customergrade",
-            checking: "base",
-            required: false
-        }, {
-            label: "客户行业",
-            error: false,
-            errMsg: "",
-            type: "option", //自定义选择  配合预定接口
-            optionNmae: "industry", //选择类型
-            optionType: "checkbox", //复选   radio 单选
-            value: "",
-            placeholder: "客户所属行业",
-            valueName: "industry",
-            checking: "base",
-            required: false
-        }, {
-            label: "税号",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "企业税号",
-            valueName: "taxno",
-            checking: "base",
-            required: false
-        }, {
-            label: "法人",
-            error: false,
-            errMsg: "",
-            type: "text",
-            value: "",
-            placeholder: "企业法人",
-            valueName: "contact",
-            checking: "base",
-            required: false
-        }, {
-            label: "联系电话",
-            error: false,
-            errMsg: "",
-            type: "number",
-            value: "",
-            placeholder: "联系电话",
-            valueName: "telephone",
-            required: false
-        }, {
-            label: "省市县",
-            error: false,
-            errMsg: "",
-            type: "region",
-            value: [],
-            placeholder: "所在地区",
-            valueName: "region",
-            required: true
-        }, {
-            label: "详细地址",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "详细地址",
-            valueName: "address",
-            checking: "base",
-            required: false
-        }, {
-            label: "上级企业",
-            error: false,
-            errMsg: "",
-            type: "route",
-            url: "/packageA/select/setclient/select",
-            value: "",
-            params: {
-                id: 20221012164402,
-                content: {
-                    nocache: true,
-                    "type": 1,
-                    "isExport": 0,
-                    isend: 0,
-                    "where": {
-                        "condition": "",
-                        "status": "", //状态
-                        "startdate": "",
-                        "enddate": ""
-                    },
-                    "sort": [{
-                        sortname: "默认",
-                        sorted: 1,
-                        sortid: 67,
-                        reversed: 0
-                    }]
-                },
-            },
-            query: "&radio=true&idname=sa_customersid",
-            placeholder: "选择上级企业",
-            valueName: "parentid",
-            checking: "base",
-            required: false
-        }, {
-            label: "客户来源",
-            error: false,
-            errMsg: "",
-            type: "selector",
-            range: [],
-            rangeKey: "name",
-            selectKey: "value",
-            rangeIndex: "",
-            value: "",
-            placeholder: "来源",
-            valueName: "source",
-            checking: "base",
-            required: true
-        }, {
-            label: "归属经销商",
-            error: false,
-            errMsg: "",
-            type: "route",
-            url: "/packageA/select/setclient/select",
-            value: "",
-            params: {
-                "id": 20230214162602,
-                "content": {
-                    "hrid": wx.getStorageSync('userMsg').hrid,
-                    "where": {
-                        "condition": ""
-                    }
-                },
-            },
-            query: "&radio=true&idname=sa_agentsid",
-            placeholder: "归属经销商",
-            valueName: "sa_agentsid",
-            checking: "base",
-            required: false
-        }],
         content: {
             "sa_customersid": 0, //新增是传0
             "sys_enterpriseid": 0, //合作企业档案ID，新增是传0，更新
@@ -355,7 +181,180 @@ Page({
     onLoad(options) {
         if (options.data) {
             let data = JSON.parse(options.data);
-            let form = this.data.form.map(v => {
+            let form = [{
+                label: "客户(企业)",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "客户(企业)名称",
+                valueName: "enterprisename",
+                checking: "base",
+                slot: "info",
+                required: true
+            }, {
+                label: "企业简称",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "企业简称",
+                valueName: "abbreviation",
+                checking: "base",
+                required: false
+            }, {
+                label: "客户类型",
+                error: false,
+                errMsg: "",
+                type: "option",
+                optionNmae: "customertypemx",
+                optionType: "radio", //复选   radio 单选
+                value: "",
+                placeholder: "客户类型",
+                valueName: "type",
+                checking: "base",
+                required: true
+            }, {
+                label: "客户分类",
+                error: false,
+                errMsg: "",
+                type: "option",
+                optionNmae: "customergrade",
+                optionType: "radio", //复选   radio 单选
+                value: "",
+                placeholder: "客户分类",
+                valueName: "customergrade",
+                checking: "base",
+                required: false
+            }, {
+                label: "客户行业",
+                error: false,
+                errMsg: "",
+                type: "option", //自定义选择  配合预定接口
+                optionNmae: "industry", //选择类型
+                optionType: "checkbox", //复选   radio 单选
+                value: "",
+                placeholder: "客户所属行业",
+                valueName: "industry",
+                checking: "base",
+                required: false
+            }, {
+                label: "税号",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "企业税号",
+                valueName: "taxno",
+                checking: "base",
+                required: false
+            }, {
+                label: "法人",
+                error: false,
+                errMsg: "",
+                type: "text",
+                value: "",
+                placeholder: "企业法人",
+                valueName: "contact",
+                checking: "base",
+                required: false
+            }, {
+                label: "联系电话",
+                error: false,
+                errMsg: "",
+                type: "number",
+                value: "",
+                placeholder: "联系电话",
+                valueName: "telephone",
+                required: false
+            }, {
+                label: "省市县",
+                error: false,
+                errMsg: "",
+                type: "region",
+                value: [],
+                placeholder: "所在地区",
+                valueName: "region",
+                required: true
+            }, {
+                label: "详细地址",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "详细地址",
+                valueName: "address",
+                checking: "base",
+                required: false
+            }, {
+                label: "上级企业",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/setclient/select",
+                value: "",
+                params: {
+                    id: 20221012164402,
+                    content: {
+                        nocache: true,
+                        "type": 1,
+                        "isExport": 0,
+                        isend: 0,
+                        "where": {
+                            "condition": "",
+                            "status": "", //状态
+                            "startdate": "",
+                            "enddate": ""
+                        },
+                        "sort": [{
+                            sortname: "默认",
+                            sorted: 1,
+                            sortid: 67,
+                            reversed: 0
+                        }]
+                    },
+                },
+                query: "&radio=true&idname=sa_customersid",
+                placeholder: "选择上级企业",
+                valueName: "parentid",
+                checking: "base",
+                required: false
+            }, {
+                label: "客户来源",
+                error: false,
+                errMsg: "",
+                type: "selector",
+                range: [],
+                rangeKey: "name",
+                selectKey: "value",
+                rangeIndex: "",
+                value: "",
+                placeholder: "来源",
+                valueName: "source",
+                checking: "base",
+                required: true
+            }, {
+                label: "归属经销商",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/setclient/select",
+                value: "",
+                params: {
+                    "id": 20230214162602,
+                    "content": {
+                        "hrid": wx.getStorageSync('userMsg').hrid,
+                        "where": {
+                            "condition": ""
+                        }
+                    },
+                },
+                query: "&radio=true&idname=sa_agentsid",
+                placeholder: "归属经销商",
+                valueName: "sa_agentsid",
+                checking: "base",
+                required: false
+            }].map(v => {
                 if (v.valueName != 'region') {
                     v.value = data[v.valueName] || "";
                     if (v.valueName == "grade") v.value = data[v.valueName] + "";

packageA/target/project.js

@@ -6,7 +6,6 @@ Page({
         content: {
             nocache: true,
             "year": new Date().getFullYear(),
-            "hrid": wx.getStorageSync('userMsg').hrid,
             "pageNumber": 1,
             "pageTotal": 1,
             "pageSize": 20,
@@ -21,6 +20,7 @@ Page({
         this.setData({
             year: options.year,
             'content.year': options.year,
+            'content.hrid': wx.getStorageSync('userMsg').hrid,
             yearArr: options.yearArr.split(","),
             pickerIndex: options.pickerIndex,
             YL: JSON.parse(options.PYL)

pages/group/modules/list/index.js

@@ -21,13 +21,15 @@ Component({
     lifetimes: {
         attached: function () {
             getApp().globalData.Language.getLanguagePackage(this)
+            this.setData({
+                userid: wx.getStorageSync('userMsg').userid,
+            })
         }
     },
     options: {
         addGlobalClass: true
     },
     data: {
-        userid: wx.getStorageSync('userMsg').userid,
         show: false,
         changeItem: {},
         loading: false

pages/login/selectSite.js

@@ -32,6 +32,8 @@ Page({
                             }, 500);
                             return
                         }
+                        wx.removeStorageSync('userMsg');
+                        wx.removeStorageSync('account_list');
                         wx.setStorageSync('userMsg', res.data);
                         wx.setStorageSync('account_list', [res.data])
                         require('./modules/login').init();

salesPanel/customerBlance/index.js

@@ -16,12 +16,14 @@ Component({
     lifetimes: {
         attached: function () {
             getApp().globalData.Language.getLanguagePackage(this)
+            this.setData({
+                "content.dataid": wx.getStorageSync('userMsg').userid,
+                "content.username": wx.getStorageSync('userMsg').name,
+            })
         }
     },
     data: {
         "content": {
-            dataid: wx.getStorageSync('userMsg').userid,
-            username: wx.getStorageSync('userMsg').name,
             enddate: new Date().toISOString().split('T')[0],
             where: {}
         },

salesPanel/index/index.js

@@ -59,8 +59,6 @@ Page({
         }],
         tabsActive: 0,
         showFiltrate: false,
-        dataid: wx.getStorageSync('userMsg').userid,
-        username: wx.getStorageSync('userMsg').name,
         type: 0,
         isleave: 1,
     },
@@ -69,6 +67,10 @@ Page({
         let organization = this.selectComponent("#organization");
         organization.initDepAndUser()
         this.partialRenewal();
+        this.setData({
+            dataid: wx.getStorageSync('userMsg').userid,
+            username: wx.getStorageSync('userMsg').name,
+        });
     }, //tabs 切换
     tabsChange({
         detail

salesPanel/panel/index.js

@@ -27,7 +27,9 @@ Component({
                     v.name = getApp().globalData.Language.getMapText(v.value);
                     v.color = v.value == this.data.content.dateType ? "#3874F6" : "";
                     return v
-                })
+                }),
+                "content.dataid": wx.getStorageSync('userMsg').userid,
+                "content.username": wx.getStorageSync('userMsg').name,
             })
         }
     },
@@ -61,8 +63,6 @@ Component({
             value: "本月"
         }],
         "content": {
-            dataid: wx.getStorageSync('userMsg').userid,
-            username: wx.getStorageSync('userMsg').name,
             type: 0,
             "dateType": "本年",
             "datatype": 1,

salesPanel/salesHourglass/index.js

@@ -48,7 +48,6 @@ Page({
         dateTypes: ["全部", "近一年", "近九个月", "近六个月", "近三个月"],
         content: {
             nocache: true,
-            dataid: wx.getStorageSync('userMsg').userid,
             type: 0,
             dateType: '全部',
             where: {
@@ -136,7 +135,8 @@ Page({
             }
         })
         this.setData({
-            isHY: ['HY', "YOSTEST1"].includes(wx.getStorageSync('userMsg').siteid)
+            isHY: ['HY', "YOSTEST1"].includes(wx.getStorageSync('userMsg').siteid),
+            "content.dataid": wx.getStorageSync('userMsg').userid,
         })
         this.setComingYear()