bug修复，经销商新增医院tab,科室tab

project.private.config.json

@@ -10,6 +10,27 @@
     "condition": {
         "miniprogram": {
             "list": [
+                {
+                    "name": "prsx/dealer/detail",
+                    "pathName": "prsx/dealer/detail",
+                    "query": "id=3527",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "prsx/department/index",
+                    "pathName": "prsx/department/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "prsx/dealer/detail",
+                    "pathName": "prsx/dealer/detail",
+                    "query": "id=3528",
+                    "launchMode": "default",
+                    "scene": null
+                },
                 {
                     "name": "prsx/hospital/detail",
                     "pathName": "prsx/hospital/detail",

prsx/activity/detail.js

@@ -1,306 +1,309 @@
 const _Http = getApp().globalData.http;
 Page({
-    data: {
-        loading: true,
-        isLeader: false, //是否为负责人
-        tabsActive: 1, //tabs 选中项
-        sat_campaignid: 0
-    },
-    onLoad(options) {
-        const appAuth = wx.getStorageSync('auth').wmarketing_activity;
-        this.setData({
-            sat_campaignid: options.id,
-            appAuth
-        })
-        this.getDetail();
-    },
+  data: {
+    loading: true,
+    isLeader: false, //是否为负责人
+    tabsActive: 1, //tabs 选中项
+    sat_campaignid: 0
+  },
+  onLoad(options) {
+    const appAuth = wx.getStorageSync('auth').wmarketing_activity;
+    this.setData({
+      sat_campaignid: options.id,
+      appAuth
+    })
+    // this.setTabbar()
+    this.getDetail();
+  },
 
-    /* 获取详情 */
-    getDetail() {
-        _Http.basic({
-            "classname": "webmanage.saletool.orderclue.ordercluecampaign",
-            "method": "queryCampaignMain",
-            "content": {
-                sat_campaignid: this.data.sat_campaignid
-            }
-        }).then(res => {
-            console.log("详情", res)
-            if (res.code != '1') return wx.showToast({
-                title: res.data,
-                icon: "none"
-            })
-            this.setPreview(res);
-            this.setData({
-                loading: false,
-                detail: res.data,
-            })
-            //获取标签
-            if (this.data.appAuth.isdatatag) this.getTags();
-            if (this.data.appAuth.isdatateam) this.getGroup()
-            this.setTabbar();
-            this.partialRenewal();
-        });
-    },
-    setPreview(res) {
-        /* 摘要信息 */
-        let briefs = [{
-            label: "活动类型",
-            value: res.data.type
-        }, {
-            label: "承办医院",
-            value: res.data.hospitalname
-        }, {
-            label: "科室",
-            value: res.data.hospitaldepname
-        }, {
-            label: "申请金额",
-            value: _Http.formatMoney(res.data.amount),
-            style: `color:#FF3B30`
-        }, {
-            label: "实际发生金额",
-            value: _Http.formatMoney(res.data.actualAmount),
-            style: `color:#FF3B30`
-        }, {
-            label: "活动地址",
-            value: res.data.province + res.data.city + res.data.county + res.data.address
-        }, {
-            label: "创建人",
-            value: res.data.createby
-        }];
+  /* 获取详情 */
+  getDetail() {
+    _Http.basic({
+      "classname": "webmanage.saletool.orderclue.ordercluecampaign",
+      "method": "queryCampaignMain",
+      "content": {
+        sat_campaignid: this.data.sat_campaignid
+      }
+    }).then(res => {
+      console.log("详情", res)
+      if (res.code != '1') return wx.showToast({
+        title: res.data,
+        icon: "none"
+      })
+      this.setPreview(res);
+      this.setData({
+        loading: false,
+        detail: res.data,
+      })
+      //获取标签
+      if (this.data.appAuth.isdatatag) this.getTags();
+      if (this.data.appAuth.isdatateam) this.getGroup()
+      this.setTabbar();
+      this.partialRenewal();
+    });
+  },
+  setPreview(res) {
+    /* 摘要信息 */
+    let briefs = [{
+      label: "活动类型",
+      value: res.data.type
+    }, {
+      label: "承办医院",
+      value: res.data.hospitalname
+    }, {
+      label: "科室",
+      value: res.data.hospitaldepname
+    }, {
+      label: "申请金额",
+      value: _Http.formatMoney(res.data.amount),
+      style: `color:#FF3B30`
+    }, {
+      label: "实际发生金额",
+      value: _Http.formatMoney(res.data.actualAmount),
+      style: `color:#FF3B30`
+    }, {
+      label: "活动地址",
+      value: res.data.province + res.data.city + res.data.county + res.data.address
+    }, {
+      label: "创建人",
+      value: res.data.createby
+    }];
 
-        /* 基本信息 */
-        let list1 = [{
-            label: "活动名称",
-            value: res.data.name
-        }, {
-            label: "承办医院",
-            value: res.data.hospitalname
-        }, {
-            label: "科室",
-            value: res.data.hospitaldepname
-        }, {
-            label: "活动类型",
-            value: res.data.type
-        }, {
-            label: "活动性质",
-            value: res.data.activitytype
-        }, {
-            label: "活动地址",
-            value: res.data.province + res.data.city + res.data.county + res.data.address
-        }, {
-            label: "开始日期",
-            value: res.data.begdate
-        }, {
-            label: "结束日期",
-            value: res.data.enddate
-        }, {
-            label: "申请金额",
-            value: _Http.formatMoney(res.data.amount)
-        }, {
-            label: "实际发生金额",
-            value: _Http.formatMoney(res.data.actualAmount)
-        }, {
-            label: "产品总培训费",
-            value: _Http.formatMoney(res.data.doctorAmount)
-        }, {
-            label: "负责人",
-            value: res.data.leader ? res.data.leader[0].name : '--'
-        }];
-        /* 系统信息 */
-        let list2 = [{
-            label: "创建人",
-            value: res.data.createby
-        }, {
-            label: "创建时间",
-            value: res.data.createdate
-        }, {
-            label: "最近编辑人",
-            value: res.data.changeby
-        }, {
-            label: "最近编辑时间",
-            value: res.data.changedate
-        }, {
-            label: "转手次数",
-            value: res.data.leader ? res.data.leader[0].leadernum : 0
-        }];
-        this.setData({
-            briefs,
-            list1,
-            list2
-        });
-    },
-    //详情按钮回调
-    tabbarOnClick({
-        detail
-    }) {
-        let data = this.data.detail,
-            that = this;
-        switch (detail.label) {
-            case "编辑":
-                wx.navigateTo({
-                    url: `/prsx/activity/insert?data=${JSON.stringify(data)}`,
-                })
-                break;
-            case "删除":
-                wx.showModal({
-                    content: '此操作将永久删除该活动,是否继续?',
-                    complete: ({
-                        confirm
-                    }) => {
-                        if (confirm) _Http.basic({
-                            "id": 20230329163504,
-                            "content": {
-                                "sat_campaignid": this.data.sat_campaignid
-                            },
-                        }).then(res => {
-                            console.log('删除', res)
-                            wx.showToast({
-                                title: res.code == 1 ? '删除成功' : res.msg,
-                                icon: 'none',
-                                mask: res.code == 1
-                            })
-                            if (res.code == 1) setTimeout(() => {
-                                wx.navigateBack()
-                            }, 400)
-                        })
-                    }
-                })
-                break;
-            case "跟进":
-                that.selectComponent("#Trace").toAdd()
-                break;
-            default:
-                console.log(detail)
-                break;
-        }
-    },
-    /* 底部功能 */
-    async setTabbar() {
-        let detail = this.data.detail,
-            isAdmin = this.data.isAdmin,
-            isLeader = detail.leader.some(some => some.userid == wx.getStorageSync('userMsg').userid),
-            editdataleader = isLeader ? 1 : 0,
-            tabbarList = [],
-            appAuth = this.data.appAuth,
-            tabsList = [{
-                label: "详细信息",
-                icon: "icon-tabxiangxixinxi1"
-            }, {
-                label: "参与医生",
-                icon: "icon-yisheng",
-                model: "#Doctors"
-            }];
-        if (!isLeader) {
-            let res = await getApp().agentOrNot("sat_campaign", this.data.sat_campaignid),
-                data = res.code == '1' ? res.data : {
-                    editable: 0,
-                    editdataleader: 0
-                }
-            if (appAuth.isdatateam) isLeader = this.selectComponent("#Group").data.editable == 1;
-            if (!isLeader) isLeader = data.editable == 1;
-            editdataleader = data.editdataleader;
-        }
-        if (appAuth.isdatafollowup) {
-            tabsList.push({
-                label: "跟进动态",
-                icon: "icon-tabgenjinjilu",
-                model: "#Trace"
-            })
-            if (detail.status != '已终止') tabbarList.unshift({
-                icon: "color-genjin",
-                label: "跟进"
-            });
-        }
-        tabsList = tabsList.concat([{
-            label: "附件",
-            icon: "icon-tabfujian1",
-            model: "#Files"
-        }, {
-            label: "操作",
-            icon: "icon-tabcaozuojilu1",
-            model: "#Record"
-        }])
-        if (isLeader || isAdmin) {
-            tabbarList.push({
-                icon: "color-bianji",
-                label: "编辑"
-            })
-            tabbarList.push({
-                icon: "icon-shanchu1",
-                label: "删除"
+    /* 基本信息 */
+    let list1 = [{
+      label: "活动名称",
+      value: res.data.name
+    }, {
+      label: "承办医院",
+      value: res.data.hospitalname
+    }, {
+      label: "科室",
+      value: res.data.hospitaldepname
+    }, {
+      label: "活动类型",
+      value: res.data.type
+    }, {
+      label: "活动性质",
+      value: res.data.activitytype
+    }, {
+      label: "活动地址",
+      value: res.data.province + res.data.city + res.data.county + res.data.address
+    }, {
+      label: "开始日期",
+      value: res.data.begdate
+    }, {
+      label: "结束日期",
+      value: res.data.enddate
+    }, {
+      label: "申请金额",
+      value: _Http.formatMoney(res.data.amount)
+    }, {
+      label: "实际发生金额",
+      value: _Http.formatMoney(res.data.actualAmount)
+    }, {
+      label: "产品总培训费",
+      value: _Http.formatMoney(res.data.doctorAmount)
+    }, {
+      label: "负责人",
+      value: res.data.leader ? res.data.leader[0].name : '--'
+    }];
+    /* 系统信息 */
+    let list2 = [{
+      label: "创建人",
+      value: res.data.createby
+    }, {
+      label: "创建时间",
+      value: res.data.createdate
+    }, {
+      label: "最近编辑人",
+      value: res.data.changeby
+    }, {
+      label: "最近编辑时间",
+      value: res.data.changedate
+    }, {
+      label: "转手次数",
+      value: res.data.leader ? res.data.leader[0].leadernum : 0
+    }];
+    this.setData({
+      briefs,
+      list1,
+      list2
+    });
+  },
+  //详情按钮回调
+  tabbarOnClick({
+    detail
+  }) {
+    let data = this.data.detail,
+      that = this;
+    switch (detail.label) {
+      case "编辑":
+        wx.navigateTo({
+          url: `/prsx/activity/insert?data=${JSON.stringify(data)}`,
+        })
+        break;
+      case "删除":
+        wx.showModal({
+          content: '此操作将永久删除该活动,是否继续?',
+          complete: ({
+            confirm
+          }) => {
+            if (confirm) _Http.basic({
+              "id": 20230329163504,
+              "content": {
+                "sat_campaignid": this.data.sat_campaignid
+              },
+            }).then(res => {
+              console.log('删除', res)
+              wx.showToast({
+                title: res.code == 1 ? '删除成功' : res.msg,
+                icon: 'none',
+                mask: res.code == 1
+              })
+              if (res.code == 1) setTimeout(() => {
+                wx.navigateBack()
+              }, 400)
             })
-        }
-        this.setData({
-            tabbarList,
-            isLeader,
-            tabsList
+          }
         })
-    },
-    //tabs 切换
-    tabsChange({
-        detail
-    }) {
-        this.setData({
-            tabsActive: detail
-        });
-        this.partialRenewal();
-    },
-    //局部数据更新 tabs
-    partialRenewal(init = false) {
-        try {
-            let model = this.data.tabsList[this.data.tabsActive].model;
-            if (model) {
-                let Component = this.selectComponent(model),
-                    {
-                        total,
-                        pageNumber,
-                        pageTotal
-                    } = Component.data.content,
-                    id = this.data.detail.sat_campaignid;
-                if (model == "#Files") init = true;
-                if (total == null || init) {
-                    Component.getList(id, init);
-                } else if (pageNumber <= pageTotal) {
-                    Component.getList(id, false);
-                }
-            }
-        } catch (error) {
+        break;
+      case "跟进":
+        that.selectComponent("#Trace").toAdd()
+        break;
+      default:
+        console.log(detail)
+        break;
+    }
+  },
+  /* 底部功能 */
+  async setTabbar() {
+    let detail = this.data.detail,
+      isAdmin = this.data.isAdmin,
+      isLeader = detail.leader.some(some => some.userid == wx.getStorageSync('userMsg').userid),
+      editdataleader = isLeader ? 1 : 0,
+      tabbarList = [],
+      appAuth = this.data.appAuth,
+      tabsList = [{
+        label: "详细信息",
+        icon: "icon-tabxiangxixinxi1"
+      }, {
+        label: "参与医生",
+        icon: "icon-yisheng",
+        model: "#Doctors"
+      }];
 
+    if (!isLeader) {
+      let res = await getApp().agentOrNot("sat_campaign", this.data.sat_campaignid),
+        data = res.code == '1' ? res.data : {
+          editable: 0,
+          editdataleader: 0
         }
-    },
-    //更新标签
-    getTags() {
-        this.selectComponent("#Tags").getTags()
-    },
-    //更新团队成员
-    getGroup() {
-        this.selectComponent("#Group").getList().then(this.setTabbarList)
-    },
-    onReachBottom() {
-        this.partialRenewal();
-    },
-    onUnload() {
-        const page = getCurrentPages().find(v => v.__route__ == 'prsx/activity/index');
-        if (!page) return;
-        let content = JSON.parse(JSON.stringify(page.data.content));
-        content.pageSize = (content.pageNumber - 1) * content.pageSize;
-        content.pageNumber = 1;
-        _Http.basic({
-            id: '20221101095102',
-            content
-        }).then(res => {
-            console.log("更新列表", res);
-            if (res.code == '1') {
-                res.data = res.data.map(v => {
-                    v.amount = _Http.formatMoney(v.amount)
-                    v.actualAmount = _Http.formatMoney(v.actualAmount)
-                    return v
-                })
-                page.setData({
-                    list: res.data,
-                    "content.total": res.total
-                })
-            }
-        })
+
+      if (appAuth.isdatateam) isLeader = this.selectComponent("#Group").data.editable == 1;
+      if (!isLeader) isLeader = data.editable == 1;
+      editdataleader = data.editdataleader;
+    }
+    if (appAuth.isdatafollowup) {
+      tabsList.push({
+        label: "跟进动态",
+        icon: "icon-tabgenjinjilu",
+        model: "#Trace"
+      })
+      if (detail.status != '已终止') tabbarList.unshift({
+        icon: "color-genjin",
+        label: "跟进"
+      });
+    }
+    tabsList = tabsList.concat([{
+      label: "附件",
+      icon: "icon-tabfujian1",
+      model: "#Files"
+    }, {
+      label: "操作",
+      icon: "icon-tabcaozuojilu1",
+      model: "#Record"
+    }])
+    if (isLeader || isAdmin) {
+      tabbarList.push({
+        icon: "color-bianji",
+        label: "编辑"
+      })
+      tabbarList.push({
+        icon: "icon-shanchu1",
+        label: "删除"
+      })
     }
+    this.setData({
+      tabbarList,
+      isLeader,
+      tabsList
+    })
+  },
+  //tabs 切换
+  tabsChange({
+    detail
+  }) {
+    this.setData({
+      tabsActive: detail
+    });
+    this.partialRenewal();
+  },
+  //局部数据更新 tabs
+  partialRenewal(init = false) {
+    try {
+      let model = this.data.tabsList[this.data.tabsActive].model;
+      if (model) {
+        let Component = this.selectComponent(model),
+          {
+            total,
+            pageNumber,
+            pageTotal
+          } = Component.data.content,
+          id = this.data.detail.sat_campaignid;
+        if (model == "#Files") init = true;
+        if (total == null || init) {
+          Component.getList(id, init);
+        } else if (pageNumber <= pageTotal) {
+          Component.getList(id, false);
+        }
+      }
+    } catch (error) {
+
+    }
+  },
+  //更新标签
+  getTags() {
+    this.selectComponent("#Tags").getTags()
+  },
+  //更新团队成员
+  getGroup() {
+    this.selectComponent("#Group").getList().then(this.setTabbarList)
+  },
+  onReachBottom() {
+    this.partialRenewal();
+  },
+  onUnload() {
+    const page = getCurrentPages().find(v => v.__route__ == 'prsx/activity/index');
+    if (!page) return;
+    let content = JSON.parse(JSON.stringify(page.data.content));
+    content.pageSize = (content.pageNumber - 1) * content.pageSize;
+    content.pageNumber = 1;
+    _Http.basic({
+      id: '20221101095102',
+      content
+    }).then(res => {
+      console.log("更新列表", res);
+      if (res.code == '1') {
+        res.data = res.data.map(v => {
+          v.amount = _Http.formatMoney(v.amount)
+          v.actualAmount = _Http.formatMoney(v.actualAmount)
+          return v
+        })
+        page.setData({
+          list: res.data,
+          "content.total": res.total
+        })
+      }
+    })
+  }
 })

prsx/activity/detail.wxml

@@ -1,28 +1,28 @@
 <view class="setclient-list-item" url="#">
-    <view class="con">
-        <view class="mian">
-            <view class="label line-1">{{detail.name}}</view>
-            <view class="tag-box" wx:if="{{appAuth.isdatatag}}">
-                <Yl-tags id="Tags" wx:if="{{appAuth.isdatatag}}" add ownertable='sat_campaign' bind:onGetList='onGetList' ownerid='{{sat_campaignid}}' />
-            </view>
-        </view>
+  <view class="con">
+    <view class="mian">
+      <view class="label line-1">{{detail.name}}</view>
+      <view class="tag-box" wx:if="{{appAuth.isdatatag}}">
+        <Yl-tags id="Tags" wx:if="{{appAuth.isdatatag}}" add ownertable='sat_campaign' bind:onGetList='onGetList' ownerid='{{sat_campaignid}}' />
+      </view>
     </view>
+  </view>
 </view>
 <view style="margin-top: -16rpx;">
-    <Yl_Detail list="{{briefs}}">
-        <Yl-group id='Group' wx:if="{{appAuth.isdatateam}}" add="{{isLeader}}" slot='bottom' ownertable='sat_campaign' ownerid='{{sat_campaignid}}' />
-    </Yl_Detail>
+  <Yl_Detail list="{{briefs}}">
+    <Yl-group id='Group' wx:if="{{appAuth.isdatateam}}" add="{{isLeader}}" slot='bottom' ownertable='sat_campaign' ownerid='{{sat_campaignid}}' />
+  </Yl_Detail>
 </view>
 <view style="height: 20rpx;" />
 <!-- 功能 -->
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
-    <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
-    <Doctors slot='参与医生' id="Doctors" disabled="{{isLeader}}" />
-    <Trace resource='市场活动' slot='跟进动态' id='Trace' ownertable='sat_campaign' ownerid='{{sat_campaignid}}' disabled="{{detail.status != '已终止'}}" ownerid1='{{detail.sys_enterpriseid}}' />
-  
-    <Record slot="操作" id="Record" ownertable='sat_campaign' ownerid='{{sat_campaignid}}' />
-    <Files slot="附件" id="Files" ownertable='sat_campaign' ownerid='{{sat_campaignid}}' disabled="{{detail.status != '已终止'}}" />
+  <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
+  <Doctors slot='参与医生' id="Doctors" disabled="{{isLeader}}" />
+  <Trace resource='市场活动' slot='跟进动态' id='Trace' ownertable='sat_campaign' ownerid='{{sat_campaignid}}' disabled="{{detail.status != '已终止'}}" ownerid1='{{detail.sys_enterpriseid}}' />
+
+  <Record slot="操作" id="Record" ownertable='sat_campaign' ownerid='{{sat_campaignid}}' />
+  <Files slot="附件" id="Files" ownertable='sat_campaign' ownerid='{{sat_campaignid}}' disabled="{{detail.status != '已终止'}}" />
 </Yl_FunTabs>
 <!-- 底部 -->
 <Yl_Tabbar wx:if="{{tabbarList.length}}" list='{{tabbarList}}' bind:callback="tabbarOnClick" />
-<wxs src='../../utils/wxmlQueryPer.wxs' module="per" />
+<wxs src='../../utils/wxmlQueryPer.wxs' module="per" />

prsx/dealer/detail.js

@@ -1,396 +1,407 @@
 const _Http = getApp().globalData.http;
 Page({
-    data: {
-        loading: true,
-        isLeader: false, //是否为负责人
-        tabsActive: 1, //tabs 选中项
-        sa_agentsid: 0,
-        sColors: getApp().globalData.sColors,
-        deletereasonShow: false,
-        deletereason: "",
-    },
-    onLoad(options) {
-        const appAuth = wx.getStorageSync('auth').wdealerMag;
-        this.setData({
-            sa_agentsid: options.id,
-            appAuth
-        })
-        this.getDetail();
-        getApp().globalData.Language.getLanguagePackage(this, '经销商详情');
-    },
+  data: {
+    loading: true,
+    isLeader: false, //是否为负责人
+    tabsActive: 1, //tabs 选中项
+    sa_agentsid: 0,
+    sColors: getApp().globalData.sColors,
+    deletereasonShow: false,
+    deletereason: "",
+  },
+  onLoad(options) {
+    const appAuth = wx.getStorageSync('auth').wdealerMag;
+    this.setData({
+      sa_agentsid: options.id,
+      appAuth
+    })
+    this.getDetail();
+    getApp().globalData.Language.getLanguagePackage(this, '经销商详情');
+  },
 
-    /* 获取详情 */
-    getDetail() {
-        /* 基本信息 */
-        _Http.basic({
-            classname: "webmanage.sale.agents.agents",
-            method: "query_agentMain",
-            "content": {
-                sa_agentsid: this.data.sa_agentsid
-            },
-        }).then(res => {
-            console.log("详情", res)
-            if (res.code != '1') return wx.showToast({
-                title: res.data,
-                icon: "none"
-            })
-            this.setPreview(res);
-            this.setData({
-                loading: false,
-                detail: res.data,
-            })
-            //获取标签
-            if (this.data.appAuth.isdatatag) this.getTags();
-            if (this.data.appAuth.isdatateam) this.getGroup()
-            this.setTabbar();
-            this.partialRenewal();
-        });
-    },
-    areaInput(e) {
-        this.setData({
-            deletereason: e.detail.value
-        })
-    },
-    onCancel() {
-        this.setData({
-            deletereasonShow: false,
-        })
-    },
-    deleteItem() {
-        _Http.basic({
-            id: 20221011145003,
-            content: {
-                deletereason: this.data.deletereason,
-                sa_agentsids: [this.data.sa_agentsid],
-                datastatus: '1'
-            }
-        }).then(res => {
-            console.log("作废", res)
+  /* 获取详情 */
+  getDetail() {
+    /* 基本信息 */
+    _Http.basic({
+      classname: "webmanage.sale.agents.agents",
+      method: "query_agentMain",
+      "content": {
+        sa_agentsid: this.data.sa_agentsid
+      },
+    }).then(res => {
+      console.log("详情", res)
+      if (res.code != '1') return wx.showToast({
+        title: res.data,
+        icon: "none"
+      })
+      this.setPreview(res);
+      this.setData({
+        loading: false,
+        detail: res.data,
+      })
+      //获取标签
+      if (this.data.appAuth.isdatatag) this.getTags();
+      if (this.data.appAuth.isdatateam) this.getGroup()
+      this.setTabbar();
+      this.partialRenewal();
+    });
+  },
+  areaInput(e) {
+    this.setData({
+      deletereason: e.detail.value
+    })
+  },
+  onCancel() {
+    this.setData({
+      deletereasonShow: false,
+    })
+  },
+  deleteItem() {
+    _Http.basic({
+      id: 20221011145003,
+      content: {
+        deletereason: this.data.deletereason,
+        sa_agentsids: [this.data.sa_agentsid],
+        datastatus: '1'
+      }
+    }).then(res => {
+      console.log("作废", res)
 
-            wx.showToast({
-                title: res.code == 1 ? '作废成功' : res.msg,
-                icon: "none",
-                mask: res.code == 1
-            })
+      wx.showToast({
+        title: res.code == 1 ? '作废成功' : res.msg,
+        icon: "none",
+        mask: res.code == 1
+      })
 
-            if (res.code == 1) setTimeout(() => {
-                wx.navigateBack()
-            }, 300)
+      if (res.code == 1) setTimeout(() => {
+        wx.navigateBack()
+      }, 300)
+    })
+  },
+  setPreview(res) {
+    /* 摘要信息 */
+    let briefs = [{
+      label: "经销商编号",
+      value: res.data.agentnum
+    }, {
+      label: "erp编号",
+      value: res.data.erpagentnum
+    }, {
+      label: "经销商类型",
+      value: res.data.type
+    }, {
+      label: "合作类型",
+      value: res.data.cooperatetype
+    }, {
+      label: "业务员",
+      value: res.data.salernames
+    }, {
+      label: "营销区域",
+      value: res.data.areanames
+    }, {
+      label: "总经理",
+      value: res.data.gmname
+    }, {
+      label: "总经理电话",
+      value: res.data.gmphonenumber
+    }, {
+      label: "详细地址",
+      value: res.data.address
+    }, {
+      label: "上级企业",
+      value: res.data.parent_enterprisename
+    }, {
+      label: "备注",
+      value: res.data.remarks
+    }];
+    /* 基本信息 */
+    let list1 = [{
+      label: "经销商名称",
+      value: res.data.enterprisename
+    }, {
+      label: "经销商编号",
+      value: res.data.agentnum
+    }, {
+      label: "erp编号",
+      value: res.data.erpagentnum
+    }, {
+      label: "合作类型",
+      value: res.data.cooperatetype
+    }, {
+      label: "公司规模",
+      value: res.data.scale
+    }, {
+      label: "主营产品/年营业额",
+      value: res.data.mainproducts
+    }, {
+      label: "总经理",
+      value: res.data.gmname
+    }, {
+      label: "总经理电话",
+      value: res.data.gmphonenumber
+    }, {
+      label: "省市县",
+      value: res.data.province + res.data.city + res.data.county
+    }, {
+      label: "详细地址",
+      value: res.data.address
+    }, {
+      label: "上级企业",
+      value: res.data.parent_enterprisename
+    }, {
+      label: "业务员",
+      value: res.data.salernames
+    }, {
+      label: "营销区域",
+      value: res.data.areanames
+    }, {
+      label: "状态",
+      value: res.data.status
+    }];
+    /* 系统信息 */
+    let list2 = [{
+      label: "创建人",
+      value: res.data.createby
+    }, {
+      label: "创建时间",
+      value: res.data.createdate
+    }, {
+      label: "最近编辑人",
+      value: res.data.changeby
+    }, {
+      label: "最近编辑时间",
+      value: res.data.changedate
+    }, {
+      label: "作废原因",
+      value: res.data.deletereason
+    }];
+    this.setData({
+      briefs,
+      list1,
+      list2
+    });
+  },
+  //详情按钮回调
+  tabbarOnClick({
+    detail
+  }) {
+    let data = this.data.detail,
+      that = this;
+    switch (detail.label) {
+      case "编辑":
+        wx.navigateTo({
+          url: `/prsx/dealer/insert?data=${JSON.stringify(data)}`,
         })
-    },
-    setPreview(res) {
-        /* 摘要信息 */
-        let briefs = [{
-            label: "经销商编号",
-            value: res.data.agentnum
-        }, {
-            label: "erp编号",
-            value: res.data.erpagentnum
-        }, {
-            label: "经销商类型",
-            value: res.data.type
-        }, {
-            label: "合作类型",
-            value: res.data.cooperatetype
-        }, {
-            label: "业务员",
-            value: res.data.salernames
-        }, {
-            label: "营销区域",
-            value: res.data.areanames
-        }, {
-            label: "总经理",
-            value: res.data.gmname
-        }, {
-            label: "总经理电话",
-            value: res.data.gmphonenumber
-        }, {
-            label: "详细地址",
-            value: res.data.address
-        }, {
-            label: "上级企业",
-            value: res.data.parent_enterprisename
-        }, {
-            label: "备注",
-            value: res.data.remarks
-        }];
-        /* 基本信息 */
-        let list1 = [{
-            label: "经销商名称",
-            value: res.data.enterprisename
-        }, {
-            label: "经销商编号",
-            value: res.data.agentnum
-        }, {
-            label: "erp编号",
-            value: res.data.erpagentnum
-        }, {
-            label: "合作类型",
-            value: res.data.cooperatetype
-        }, {
-            label: "公司规模",
-            value: res.data.scale
-        }, {
-            label: "主营产品/年营业额",
-            value: res.data.mainproducts
-        }, {
-            label: "总经理",
-            value: res.data.gmname
-        }, {
-            label: "总经理电话",
-            value: res.data.gmphonenumber
-        }, {
-            label: "省市县",
-            value: res.data.province + res.data.city + res.data.county
-        }, {
-            label: "详细地址",
-            value: res.data.address
-        }, {
-            label: "上级企业",
-            value: res.data.parent_enterprisename
-        }, {
-            label: "业务员",
-            value: res.data.salernames
-        }, {
-            label: "营销区域",
-            value: res.data.areanames
-        }, {
-            label: "状态",
-            value: res.data.status
-        }];
-        /* 系统信息 */
-        let list2 = [{
-            label: "创建人",
-            value: res.data.createby
-        }, {
-            label: "创建时间",
-            value: res.data.createdate
-        }, {
-            label: "最近编辑人",
-            value: res.data.changeby
-        }, {
-            label: "最近编辑时间",
-            value: res.data.changedate
-        }, {
-            label: "作废原因",
-            value: res.data.deletereason
-        }];
-        this.setData({
-            briefs,
-            list1,
-            list2
-        });
-    },
-    //详情按钮回调
-    tabbarOnClick({
-        detail
-    }) {
-        let data = this.data.detail,
-            that = this;
-        switch (detail.label) {
-            case "编辑":
-                wx.navigateTo({
-                    url: `/prsx/dealer/insert?data=${JSON.stringify(data)}`,
-                })
-                break;
-            case "启用":
-                wx.showModal({
-                    content: "是否确定启用该经销商？",
-                    complete: ({
-                        confirm
-                    }) => {
-                        if (confirm) _Http.basic({
-                            "content": {
-                                "sa_agentsids": [data.sa_agentsid],
-                                "status": "启用"
-                            },
-                            "id": "20230212101703",
-                        }).then(res => {
-                            console.log("启用经销商", res)
-                            wx.showToast({
-                                title: res.code == 1 ? '启用成功' : res.msg,
-                                icon: "none"
-                            })
-                            if (res.code == 1) that.getDetail()
-                        })
-                    }
-                })
-                break;
-            case "禁用":
-                wx.showModal({
-                    content: "是否确定禁用该经销商？",
-                    complete: ({
-                        confirm
-                    }) => {
-                        if (confirm) _Http.basic({
-                            "content": {
-                                "sa_agentsids": [data.sa_agentsid],
-                                "status": "禁用"
-                            },
-                            "id": "20230212101703",
-                        }).then(res => {
-                            console.log("启用经销商", res)
-                            wx.showToast({
-                                title: res.code == 1 ? '禁用成功' : res.msg,
-                                icon: "none"
-                            })
-                            if (res.code == 1) that.getDetail()
-                        })
-                    }
-                })
-                break;
-            case "作废":
-                that.setData({
-                    deletereasonShow: true
-                })
-                break;
-            case "跟进":
-                that.selectComponent("#Trace").toAdd()
-                break;
-            default:
-                console.log(detail)
-                break;
-        }
-    },
-    /* 底部功能 */
-    async setTabbar() {
-        let detail = this.data.detail,
-            isAdmin = wx.getStorageSync("userMsg").usertype == 0,
-            isLeader = false,
-            editdataleader = isLeader ? 1 : 0,
-            tabbarList = [],
-            appAuth = this.data.appAuth,
-            tabsList = [{
-                label: "详细信息",
-                icon: "icon-tabxiangxixinxi1"
-            }, {
-                label: "合同",
-                icon: "icon-tabhetong",
-                model: "#Contract"
-            }, {
-                label: "地址管理",
-                icon: "icon-tabdizhi",
-                model: "#Address"
-            }];
-        if (!isLeader) {
-            let res = await getApp().agentOrNot("sa_agents", this.data.sa_agentsid),
-                data = res.code == '1' ? res.data : {
-                    editable: 0,
-                    editdataleader: 0
-                }
-            if (appAuth.isdatateam) isLeader = this.selectComponent("#Group").data.editable == 1;
-            if (!isLeader) isLeader = data.editable == 1;
-            editdataleader = data.editdataleader;
-        }
-        if (appAuth.isdatafollowup) {
-            tabsList.unshift({
-                label: "跟进动态",
-                icon: "icon-tabgenjinjilu",
-                model: "#Trace"
+        break;
+      case "启用":
+        wx.showModal({
+          content: "是否确定启用该经销商？",
+          complete: ({
+            confirm
+          }) => {
+            if (confirm) _Http.basic({
+              "content": {
+                "sa_agentsids": [data.sa_agentsid],
+                "status": "启用"
+              },
+              "id": "20230212101703",
+            }).then(res => {
+              console.log("启用经销商", res)
+              wx.showToast({
+                title: res.code == 1 ? '启用成功' : res.msg,
+                icon: "none"
+              })
+              if (res.code == 1) that.getDetail()
             })
-            tabbarList.push({
-                icon: "color-genjin",
-                label: "跟进"
-            });
-        }
-
-        if (isAdmin || isLeader || appAuth.update) tabbarList.push({
-            icon: "color-bianji",
-            label: "编辑"
-        })
-        if (isAdmin || isLeader || appAuth.startorstop) tabbarList.push({
-            icon: "icon-qiyong",
-            label: detail.status == '启用' ? '禁用' : '启用'
+          }
         })
-        if ((isAdmin || isLeader || appAuth.delete) && detail.status == '禁用') tabbarList.push({
-            icon: "icon-shanchu",
-            label: "作废"
+        break;
+      case "禁用":
+        wx.showModal({
+          content: "是否确定禁用该经销商？",
+          complete: ({
+            confirm
+          }) => {
+            if (confirm) _Http.basic({
+              "content": {
+                "sa_agentsids": [data.sa_agentsid],
+                "status": "禁用"
+              },
+              "id": "20230212101703",
+            }).then(res => {
+              console.log("启用经销商", res)
+              wx.showToast({
+                title: res.code == 1 ? '禁用成功' : res.msg,
+                icon: "none"
+              })
+              if (res.code == 1) that.getDetail()
+            })
+          }
         })
-
-        tabsList = tabsList.concat([{
-            label: "附件",
-            icon: "icon-tabfujian1",
-            model: "#Files"
-        }, {
-            label: "操作",
-            icon: "icon-tabcaozuojilu1",
-            model: "#Record"
-        }])
-        if (this.data.appAuth.options.find(v => v == 'viewRepetition')) tabbarList.push({
-            icon: "icon-a-shouyejingangquhehuoren",
-            label: "查看重复"
-        });
-        this.setData({
-            tabbarList,
-            isLeader,
-            tabsList
+        break;
+      case "作废":
+        that.setData({
+          deletereasonShow: true
         })
-    },
-    //tabs 切换
-    tabsChange({
-        detail
-    }) {
-        this.setData({
-            tabsActive: detail
-        });
-        this.partialRenewal();
-    },
-    //局部数据更新 tabs
-    partialRenewal(init = false) {
-        try {
-            let model = this.data.tabsList[this.data.tabsActive].model;
-            if (model) {
-                let Component = this.selectComponent(model),
-                    {
-                        total,
-                        pageNumber,
-                        pageTotal
-                    } = Component.data.content,
-                    id = model == "#Address" ? this.data.detail.sys_enterpriseid : this.data.detail.sa_agentsid;
-                if (model == "#Files") init = true;
-                if (total == null || init) {
-                    Component.getList(id, init);
-                } else if (pageNumber <= pageTotal) {
-                    Component.getList(id, false);
-                }
-            }
-        } catch (error) {
+        break;
+      case "跟进":
+        that.selectComponent("#Trace").toAdd()
+        break;
+      default:
+        console.log(detail)
+        break;
+    }
+  },
+  /* 底部功能 */
+  async setTabbar() {
+    let detail = this.data.detail,
+      isAdmin = wx.getStorageSync("userMsg").usertype == 0,
+      isLeader = false,
+      editdataleader = isLeader ? 1 : 0,
+      tabbarList = [],
+      appAuth = this.data.appAuth,
+      tabsList = [{
+        label: "详细信息",
+        icon: "icon-tabxiangxixinxi1"
+      }, {
+        label: "授权业务员",
+        icon: "icon-shouquanyewuyuan",
+        model: "#Salesperson"
+      }, {
+        label: "科室",
+        icon: "icon-keshi",
+        model: "#Department"
+      }, {
+        label: "医院",
+        icon: "icon-jingxiaoshang",
+        model: "#Hospital"
+      }, {
+        label: "合同",
+        icon: "icon-tabhetong",
+        model: "#Contract"
+      }, {
+        label: "地址管理",
+        icon: "icon-tabdizhi",
+        model: "#Address"
+      }];
+    if (!isLeader) {
+      let res = await getApp().agentOrNot("sa_agents", this.data.sa_agentsid),
+        data = res.code == '1' ? res.data : {
+          editable: 0,
+          editdataleader: 0
+        }
+      if (appAuth.isdatateam) isLeader = this.selectComponent("#Group").data.editable == 1;
+      if (!isLeader) isLeader = data.editable == 1;
+      editdataleader = data.editdataleader;
+    }
+    if (appAuth.isdatafollowup) {
+      tabsList.unshift({
+        label: "跟进动态",
+        icon: "icon-tabgenjinjilu",
+        model: "#Trace"
+      })
+      tabbarList.push({
+        icon: "color-genjin",
+        label: "跟进"
+      });
+    }
+    if (isAdmin || isLeader || appAuth.update) tabbarList.push({
+      icon: "color-bianji",
+      label: "编辑"
+    })
+    if (isAdmin || isLeader || appAuth.startorstop) tabbarList.push({
+      icon: "icon-qiyong",
+      label: detail.status == '启用' ? '禁用' : '启用'
+    })
+    if ((isAdmin || isLeader || appAuth.delete) && detail.status == '禁用') tabbarList.push({
+      icon: "icon-shanchu",
+      label: "作废"
+    })
 
+    tabsList = tabsList.concat([{
+      label: "附件",
+      icon: "icon-tabfujian1",
+      model: "#Files"
+    }, {
+      label: "操作",
+      icon: "icon-tabcaozuojilu1",
+      model: "#Record"
+    }])
+    if (this.data.appAuth.options.find(v => v == 'viewRepetition')) tabbarList.push({
+      icon: "icon-a-shouyejingangquhehuoren",
+      label: "查看重复"
+    });
+    this.setData({
+      tabbarList,
+      isLeader,
+      tabsList
+    })
+  },
+  //tabs 切换
+  tabsChange({
+    detail
+  }) {
+    this.setData({
+      tabsActive: detail
+    });
+    this.partialRenewal();
+  },
+  //局部数据更新 tabs
+  partialRenewal(init = false) {
+    try {
+      let model = this.data.tabsList[this.data.tabsActive].model;
+      if (model) {
+        let Component = this.selectComponent(model),
+          {
+            total,
+            pageNumber,
+            pageTotal
+          } = Component.data.content,
+          id = model == "#Address" ? this.data.detail.sys_enterpriseid : this.data.detail.sa_agentsid;
+        if (model == "#Files") init = true;
+        if (total == null || init) {
+          Component.getList(id, init);
+        } else if (pageNumber <= pageTotal) {
+          Component.getList(id, false);
         }
-    },
-    //更新标签
-    getTags() {
-        this.selectComponent("#Tags").getTags()
-    },
-    //更新团队成员
-    getGroup() {
-        this.selectComponent("#Group").getList().then(this.setTabbarList)
-    },
-    onReachBottom() {
-        this.partialRenewal();
-    },
-    onUnload() {
-        getCurrentPages().forEach(page => {
-            if (page.__route__ == 'prsx/dealer/index') {
-                let content = JSON.parse(JSON.stringify(page.data.content));
-                content.pageSize = (content.pageNumber - 1) * content.pageSize;
-                content.pageNumber = 1;
-                _Http.basic({
-                    id: '20221011144903',
-                    content
-                }).then(res => {
-                    console.log("更新列表", res);
-                    if (res.code == '1') {
-                        page.setData({
-                            list: res.data,
-                            "content.total": res.total
-                        })
-                    }
-                })
-            } else {
-                let page1 = page.selectComponent("#Dealer");
-                if (page1) page1.getList("", true)
-            }
-        })
+      }
+    } catch (error) {
+
     }
+  },
+  //更新标签
+  getTags() {
+    this.selectComponent("#Tags").getTags()
+  },
+  //更新团队成员
+  getGroup() {
+    this.selectComponent("#Group").getList().then(this.setTabbarList)
+  },
+  onReachBottom() {
+    this.partialRenewal();
+  },
+  onUnload() {
+    getCurrentPages().forEach(page => {
+      if (page.__route__ == 'prsx/dealer/index') {
+        let content = JSON.parse(JSON.stringify(page.data.content));
+        content.pageSize = (content.pageNumber - 1) * content.pageSize;
+        content.pageNumber = 1;
+        _Http.basic({
+          id: '20221011144903',
+          content
+        }).then(res => {
+          console.log("更新列表", res);
+          if (res.code == '1') {
+            page.setData({
+              list: res.data,
+              "content.total": res.total
+            })
+          }
+        })
+      } else {
+        let page1 = page.selectComponent("#Dealer");
+        if (page1) page1.getList("", true)
+      }
+    })
+  }
 })

prsx/dealer/detail.json

@@ -3,7 +3,10 @@
         "van-dialog": "@vant/weapp/dialog/index",
         "Trace": "/prsx/trace/index",
         "Contract": "./Contract/index",
-        "Address": "/prsx/hospital/address/index"
+        "Address": "/prsx/hospital/address/index",
+        "Salesperson":"/prsx/dealer/Salesperson/index",
+        "Hospital":"/prsx/dealer/Hospital/index",
+        "Department":"/prsx/dealer/Department/index"
     },
     "navigationBarTitleText": "经销商详情"
 }

prsx/dealer/detail.wxml

@@ -18,11 +18,15 @@
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
     <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
     <Trace resource='经销商管理' slot='跟进动态' id='Trace' ownertable='sa_agents' ownerid='{{sys_enterpriseid}}' disabled="{{detail.status != '已终止'}}" ownerid1='{{detail.sa_agentsid}}' />
+    <Salesperson slot='授权业务员' id="Salesperson" disabled="{{per.query(appAuth.options,'salesAuth')}}"></Salesperson>
+    <Department slot='科室' id='Department'></Department>
+    <Hospital slot='医院' id='Hospital'></Hospital>
     <Contract slot='合同' id='Contract' />
     <Address slot='地址管理' id='Address' disabled="{{(per.query(appAuth.options,'address')||isAdmin||isLeader)&& detail.status != '已终止'}}" />
     <Record slot="操作" id="Record" ownertable='sa_agents' ownerid='{{sa_agentsid}}' />
     <Files slot="附件" id="Files" ownertable='sa_agents' ownerid='{{sa_agentsid}}' disabled="{{detail.status != '已终止'}}" />
 </Yl_FunTabs>
+<view style="height: 90rpx;" />
 <!-- 底部 -->
 <Yl_Tabbar wx:if="{{tabbarList.length}}" list='{{tabbarList}}' bind:callback="tabbarOnClick" />
 <wxs src='../../utils/wxmlQueryPer.wxs' module="per" />

prsx/dealer/insert.js

@@ -96,6 +96,26 @@ Page({
             checking: "base",
             required: false
         }, {
+          label: "企业规模",
+          error: false,
+          errMsg: "",
+          type: "textarea",
+          value: "",
+          placeholder: "企业规模",
+          valueName: "scale",
+          checking: "base",
+          required: false
+      }, {
+        label: "主营产品/年营业额",
+        error: false,
+        errMsg: "",
+        type: "textarea",
+        value: "",
+        placeholder: "主营产品/年营业额",
+        valueName: "mainproducts",
+        checking: "base",
+        required: false
+    }, {
             label: "上级企业",
             error: false,
             errMsg: "",

prsx/department/Doctors/index.js

@@ -1,103 +1,104 @@
 const _Http = getApp().globalData.http;
 
 Component({
-    properties: {
-        disabled: {
-            type: Boolean,
-            value: true
-        }
+  properties: {
+    disabled: {
+      type: Boolean,
+      value: true
+    }
+  },
+  options: {
+    addGlobalClass: true
+  },
+  data: {
+    sa_hospitaldepid: 0,
+    content: {
+      nocache: true,
+      pageNumber: 1,
+      pageSize: 10,
+      pageTotal: 1,
+      total: null,
+      where: {
+        condition: ""
+      }
     },
-    options: {
-        addGlobalClass: true
+    list: [],
+    showSearch: false,
+    focus: false,
+    condition: ""
+  },
+  lifetimes: {
+    attached: function () {
+      getApp().globalData.Language.getLanguagePackage(this)
+    }
+  },
+  methods: {
+    getList(id, init = false) {
+      let content = {
+        ...this.data.content,
+        sa_hospitaldepid: id || this.data.sa_hospitaldepid
+      };
+      if (init) {
+        content.pageNumber = 1
+        content.pageTotal = 1
+      }
+      _Http.basic({
+        "id": 2025102214574202,
+        content
+      }).then(res => {
+        console.log("科室医生", res)
+        if (res.code != '1') return wx.showToast({
+          title: res.data,
+          icon: "none"
+        });
+        let list = res.data
+        this.setData({
+          "content.pageNumber": res.pageNumber + 1,
+          "content.pageTotal": res.pageTotal,
+          "content.total": res.total,
+          list: res.pageNumber == 1 ? list : this.data.list.concat(list),
+          sa_hospitaldepid: content.sa_hospitaldepid
+        })
+        getCurrentPages().find(v => v.__route__ == 'prsx/department/detail').getDetail()
+      })
     },
-    data: {
-        sa_hospitaldepid: 0,
-        content: {
-            nocache: true,
-            pageNumber: 1,
-            pageSize: 10,
-            pageTotal: 1,
-            total: null,
-            where: {
-                condition: ""
-            }
-        },
-        list: [],
-        showSearch: false,
-        focus: false,
-        condition: ""
+    insetr() {
+      let detail = getCurrentPages().find(v => v.route == 'prsx/department/detail').data.detail;
+      let department = [detail.hospitaldepname, [detail.sa_hospitaldepid]];
+      wx.navigateTo({
+        url: '/prsx/doctors/insert?department=' + JSON.stringify(department),
+      })
     },
-    lifetimes: {
-        attached: function () {
-            getApp().globalData.Language.getLanguagePackage(this)
-        }
+    toSearch() {
+      if (this.data.showSearch && this.data.content.where.condition) {
+        this.data.content.where.condition = '';
+        this.getList("", true);
+      } else if (this.data.condition) {
+        this.data.content.where.condition = this.data.condition;
+        this.setData({
+          condition: this.data.condition
+        })
+        this.getList("", true);
+      }
+      this.setData({
+        showSearch: !this.data.showSearch
+      })
+      setTimeout(() => {
+        this.setData({
+          focus: this.data.showSearch
+        })
+      }, 300)
     },
-    methods: {
-        getList(id, init = false) {
-            let content = {
-                ...this.data.content,
-                sa_hospitaldepid: id || this.data.sa_hospitaldepid
-            };
-            if (init) {
-                content.pageNumber = 1
-                content.pageTotal = 1
-            }
-            _Http.basic({
-                "id": 2025102214574202,
-                content
-            }).then(res => {
-                console.log("科室医生", res)
-                if (res.code != '1') return wx.showToast({
-                    title: res.data,
-                    icon: "none"
-                });
-                let list = res.data
-                this.setData({
-                    "content.pageNumber": res.pageNumber + 1,
-                    "content.pageTotal": res.pageTotal,
-                    "content.total": res.total,
-                    list: res.pageNumber == 1 ? list : this.data.list.concat(list),
-                    sa_hospitaldepid: content.sa_hospitaldepid
-                })
-            })
-        },
-        insetr() {
-            let detail = getCurrentPages().find(v => v.route == 'prsx/department/detail').data.detail;
-            let department = [detail.hospitaldepname, [detail.sa_hospitaldepid]];
-            wx.navigateTo({
-                url: '/prsx/doctors/insert?department=' + JSON.stringify(department),
-            })
-        },
-        toSearch() {
-            if (this.data.showSearch && this.data.content.where.condition) {
-                this.data.content.where.condition = '';
-                this.getList("", true);
-            } else if (this.data.condition) {
-                this.data.content.where.condition = this.data.condition;
-                this.setData({
-                    condition: this.data.condition
-                })
-                this.getList("", true);
-            }
-            this.setData({
-                showSearch: !this.data.showSearch
-            })
-            setTimeout(() => {
-                this.setData({
-                    focus: this.data.showSearch
-                })
-            }, 300)
-        },
-        onChange({
-            detail
-        }) {
-            this.data.condition = detail;
-        },
-        onSearch({
-            detail
-        }) {
-            this.data.content.where.condition = detail;
-            this.getList("", true)
-        },
-    }
+    onChange({
+      detail
+    }) {
+      this.data.condition = detail;
+    },
+    onSearch({
+      detail
+    }) {
+      this.data.content.where.condition = detail;
+      this.getList("", true)
+    },
+  }
 })

prsx/department/Product/index.js

@@ -1,235 +1,236 @@
 const _Http = getApp().globalData.http;
 
 Component({
-    properties: {
-        disabled: {
-            type: Boolean,
-            value: false
-        }
-    },
-    options: {
-        addGlobalClass: true
+  properties: {
+    disabled: {
+      type: Boolean,
+      value: false
+    }
+  },
+  options: {
+    addGlobalClass: true
+  },
+  data: {
+    sa_hospitaldepid: 0,
+    content: {
+      nocache: true,
+      pageNumber: 1,
+      pageSize: 10,
+      pageTotal: 1,
+      total: null,
+      where: {
+        condition: ""
+      }
     },
-    data: {
-        sa_hospitaldepid: 0,
-        content: {
-            nocache: true,
-            pageNumber: 1,
-            pageSize: 10,
-            pageTotal: 1,
-            total: null,
-            where: {
-                condition: ""
-            }
-        },
-        list: [],
-        showSearch: false,
-        focus: false,
-        condition: "",
-        stages: [],
-        showAction: false
+    list: [],
+    showSearch: false,
+    focus: false,
+    condition: "",
+    stages: [],
+    showAction: false
+  },
+  methods: {
+    changeStage(e) {
+      const {
+        item
+      } = e.currentTarget.dataset,
+        that = this;
+      this.setData({
+        stages: this.data.stages.map(v => {
+          v.color = v.stagename == item.stagename ? '#3874F6' : ''
+          return v
+        }),
+        showAction: true,
+        changeItem: item
+      })
     },
-    methods: {
-        changeStage(e) {
-            const {
-                item
-            } = e.currentTarget.dataset,
-                that = this;
-            this.setData({
-                stages: this.data.stages.map(v => {
-                    v.color = v.stagename == item.stagename ? '#3874F6' : ''
-                    return v
-                }),
-                showAction: true,
-                changeItem: item
-            })
-        },
-        onSelect({
-            detail
-        }) {
-            let item = this.data.changeItem,
-                that = this;
-            if (detail.color) return that.onCancel()
+    onSelect({
+      detail
+    }) {
+      let item = this.data.changeItem,
+        that = this;
+      if (detail.color) return that.onCancel()
 
-            wx.showModal({
-                content: `是否确定将阶段修改为“${detail.stagename}”？`,
-                complete: ({
-                    confirm
-                }) => {
-                    if (confirm) _Http.basic({
-                        "id": "2025102110224102",
-                        "content": {
-                            sa_hospitaldep_itemid: item.sa_hospitaldep_itemid,
-                            sa_devstageid: detail.sa_devstageid
-                        },
-                    }).then(res => {
-                        wx.showToast({
-                            title: res.code == 1 ? '修改成功' : res.msg,
-                            icon: "none"
-                        })
-                        if (res.code == 1) {
-                            that.getList('', true)
-                            that.onCancel()
-                        }
-                    })
-                }
-            })
-        },
-        onCancel() {
-            this.setData({
-                showAction: false,
-                changeItem: null
+      wx.showModal({
+        content: `是否确定将阶段修改为“${detail.stagename}”？`,
+        complete: ({
+          confirm
+        }) => {
+          if (confirm) _Http.basic({
+            "id": "2025102110224102",
+            "content": {
+              sa_hospitaldep_itemid: item.sa_hospitaldep_itemid,
+              sa_devstageid: detail.sa_devstageid
+            },
+          }).then(res => {
+            wx.showToast({
+              title: res.code == 1 ? '修改成功' : res.msg,
+              icon: "none"
             })
-        },
-        getList(id, init = false) {
-            let content = {
-                ...this.data.content,
-                sa_hospitaldepid: id || this.data.sa_hospitaldepid
-            };
-            if (init) {
-                content.pageNumber = 1
-                content.pageTotal = 1
+            if (res.code == 1) {
+              that.getList('', true)
+              that.onCancel()
+              getCurrentPages().find(v => v.__route__ == 'prsx/department/detail').getDetail()
             }
-            if (this.data.stages.length == 0) _Http.basic({
-                "content": {
-                    "pageNumber": 1,
-                    "pageSize": 999,
-                    "where": {
-                        "condition": ""
-                    }
-                },
-                "id": 2025100916245502,
-            }).then(res => {
-                console.log("获取阶段列表", res)
-                if (res.code != 1) return;
-                this.setData({
-                    stages: res.data.map(v => {
-                        v.name = v.stagename
-                        return v
-                    })
-                })
-            })
-            _Http.basic({
-                "id": 2025102110205102,
-                content
-            }).then(res => {
-                console.log("科室推荐产品", res)
-                if (res.code != '1') return wx.showToast({
-                    title: res.data,
-                    icon: "none"
-                });
-                let list = res.data.map(v => {
-                    v.cover = v.attinfos.length ? _Http.getSpecifiedImage(v.attinfos[0]) : ''
-                    return v
-                })
-                this.setData({
-                    "content.pageNumber": res.pageNumber + 1,
-                    "content.pageTotal": res.pageTotal,
-                    "content.total": res.total,
-                    list: res.pageNumber == 1 ? list : this.data.list.concat(list),
-                    sa_hospitaldepid: content.sa_hospitaldepid
-                })
-            })
+          })
+        }
+      })
+    },
+    onCancel() {
+      this.setData({
+        showAction: false,
+        changeItem: null
+      })
+    },
+    getList(id, init = false) {
+      let content = {
+        ...this.data.content,
+        sa_hospitaldepid: id || this.data.sa_hospitaldepid
+      };
+      if (init) {
+        content.pageNumber = 1
+        content.pageTotal = 1
+      }
+      if (this.data.stages.length == 0) _Http.basic({
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 999,
+          "where": {
+            "condition": ""
+          }
         },
-        insetr() {
-            let params = {
-                "id": "2025102110220202",
-                "content": {
-                    "sa_hospitaldepid": this.data.sa_hospitaldepid,
-                    "where": {
-                        "condition": "",
-                    }
-                }
-            };
-            wx.navigateTo({
-                url: `/prsx/select/product/index?params=${JSON.stringify(params)}&radio=true`
+        "id": 2025100916245502,
+      }).then(res => {
+        console.log("获取阶段列表", res)
+        if (res.code != 1) return;
+        this.setData({
+          stages: res.data.map(v => {
+            v.name = v.stagename
+            return v
+          })
+        })
+      })
+      _Http.basic({
+        "id": 2025102110205102,
+        content
+      }).then(res => {
+        console.log("科室推荐产品", res)
+        if (res.code != '1') return wx.showToast({
+          title: res.data,
+          icon: "none"
+        });
+        let list = res.data.map(v => {
+          v.cover = v.attinfos.length ? _Http.getSpecifiedImage(v.attinfos[0]) : ''
+          return v
+        })
+        this.setData({
+          "content.pageNumber": res.pageNumber + 1,
+          "content.pageTotal": res.pageTotal,
+          "content.total": res.total,
+          list: res.pageNumber == 1 ? list : this.data.list.concat(list),
+          sa_hospitaldepid: content.sa_hospitaldepid
+        })
+      })
+    },
+    insetr() {
+      let params = {
+        "id": "2025102110220202",
+        "content": {
+          "sa_hospitaldepid": this.data.sa_hospitaldepid,
+          "where": {
+            "condition": "",
+          }
+        }
+      };
+      wx.navigateTo({
+        url: `/prsx/select/product/index?params=${JSON.stringify(params)}&radio=true`
+      })
+      let that = this;
+      _Http.handleSelect = ({
+        item
+      }) => {
+        wx.showModal({
+          content: `是否确定添加“${item.itemname}”到推荐产品？`,
+          complete: ({
+            confirm
+          }) => {
+            if (confirm) _Http.basic({
+              "id": "2025102110170902",
+              "content": {
+                "sa_hospitaldepid": that.data.sa_hospitaldepid,
+                "itemids": [item.itemid]
+              },
+            }).then(res => {
+              wx.showToast({
+                title: res.code == 1 ? '添加成功' : res.msg,
+                icon: "none"
+              })
+              if (res.code == 1) {
+                that.getList('', true)
+                getCurrentPages().find(v => v.__route__ == 'prsx/select/product/index').uploadList()
+              }
             })
-            let that = this;
-            _Http.handleSelect = ({
-                item
-            }) => {
-                wx.showModal({
-                    content: `是否确定添加“${item.itemname}”到推荐产品？`,
-                    complete: ({
-                        confirm
-                    }) => {
-                        if (confirm) _Http.basic({
-                            "id": "2025102110170902",
-                            "content": {
-                                "sa_hospitaldepid": that.data.sa_hospitaldepid,
-                                "itemids": [item.itemid]
-                            },
-                        }).then(res => {
-                            wx.showToast({
-                                title: res.code == 1 ? '添加成功' : res.msg,
-                                icon: "none"
-                            })
-                            if (res.code == 1) {
-                                that.getList('', true)
-                                getCurrentPages().find(v => v.__route__ == 'prsx/select/product/index').uploadList()
-                            }
-                        })
-                    }
-                })
-            }
-        },
-        deleteItem(e) {
-            const {
-                item
-            } = e.currentTarget.dataset,
-                that = this;
-            wx.showModal({
-                content: `是否确定删除“${item.itemname}”？`,
-                complete: ({
-                    confirm
-                }) => {
-                    if (confirm) _Http.basic({
-                        "id": "2025102110202602",
-                        "content": {
-                            sa_hospitaldep_itemid: item.sa_hospitaldep_itemid
-                        },
-                    }).then(res => {
-                        wx.showToast({
-                            title: res.code == 1 ? '删除成功' : res.msg,
-                            icon: "none"
-                        })
-                        if (res.code == 1) {
-                            that.getList('', true)
-                        }
-                    })
-                }
+          }
+        })
+      }
+    },
+    deleteItem(e) {
+      const {
+        item
+      } = e.currentTarget.dataset,
+        that = this;
+      wx.showModal({
+        content: `是否确定删除“${item.itemname}”？`,
+        complete: ({
+          confirm
+        }) => {
+          if (confirm) _Http.basic({
+            "id": "2025102110202602",
+            "content": {
+              sa_hospitaldep_itemid: item.sa_hospitaldep_itemid
+            },
+          }).then(res => {
+            wx.showToast({
+              title: res.code == 1 ? '删除成功' : res.msg,
+              icon: "none"
             })
-        },
-        toSearch() {
-            if (this.data.showSearch && this.data.content.where.condition) {
-                this.data.content.where.condition = '';
-                this.getList("", true);
-            } else if (this.data.condition) {
-                this.data.content.where.condition = this.data.condition;
-                this.setData({
-                    condition: this.data.condition
-                })
-                this.getList("", true);
+            if (res.code == 1) {
+              that.getList('', true)
             }
-            this.setData({
-                showSearch: !this.data.showSearch
-            })
-            setTimeout(() => {
-                this.setData({
-                    focus: this.data.showSearch
-                })
-            }, 300)
-        },
-        onChange({
-            detail
-        }) {
-            this.data.condition = detail;
-        },
-        onSearch({
-            detail
-        }) {
-            this.data.content.where.condition = detail;
-            this.getList("", true)
-        },
-    }
+          })
+        }
+      })
+    },
+    toSearch() {
+      if (this.data.showSearch && this.data.content.where.condition) {
+        this.data.content.where.condition = '';
+        this.getList("", true);
+      } else if (this.data.condition) {
+        this.data.content.where.condition = this.data.condition;
+        this.setData({
+          condition: this.data.condition
+        })
+        this.getList("", true);
+      }
+      this.setData({
+        showSearch: !this.data.showSearch
+      })
+      setTimeout(() => {
+        this.setData({
+          focus: this.data.showSearch
+        })
+      }, 300)
+    },
+    onChange({
+      detail
+    }) {
+      this.data.condition = detail;
+    },
+    onSearch({
+      detail
+    }) {
+      this.data.content.where.condition = detail;
+      this.getList("", true)
+    },
+  }
 })

prsx/department/detail.js

@@ -254,7 +254,7 @@ Page({
             editdataleader = isLeader ? 1 : 0,
             tabbarList = [],
             appAuth = this.data.appAuth;
-        if (isLeader || isAdmin) {
+        if (isLeader && isAdmin) {
             tabbarList.push({
                 icon: "color-bianji",
                 label: "编辑"

prsx/department/detail.wxml

@@ -18,8 +18,8 @@
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
     <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
     <Trace resource='科室管理' slot='跟进动态' id='Trace' ownertable='sa_hospitaldep' ownerid='{{sa_hospitaldepid}}' ownerid1='{{detail.sys_enterpriseid}}' />
-    <Doctors slot="医生" id='Doctors' />
-    <Product slot="推荐产品" id='Product' disabled="{{isLeader || isAdmin}}" />
+    <Doctors slot="医生" id='Doctors' disabled="{{isLeader && isAdmin}}"/>
+    <Product slot="推荐产品" id='Product' disabled="{{isLeader && isAdmin}}" />
     <Record slot="操作" id="Record" ownertable='sa_hospitaldep' ownerid='{{sa_hospitaldepid}}' />
     <Files slot="附件" id="Files" ownertable='sa_hospitaldep' ownerid='{{sa_hospitaldepid}}' disabled="{{detail.status != '已终止'}}" />
 </Yl_FunTabs>

prsx/hospital/Dealer/index.wxml

@@ -1,74 +1,74 @@
 <view class="head">
-	<view class="count">
-		经销商
-	</view>
-	<view class="expand">
-		<van-search wx:if="{{showSearch}}" custom-class='custom-class' focus='{{focus}}' value="{{ condition }}" shape="round" bind:change='onChange' bind:search='onSearch' bind:clear='onSearch' placeholder="搜索关键词" background='#F4F5F7' />
-		<navigator url="#" class="but" bindtap="toSearch">
-			<van-icon name="search" />
-		</navigator>
-		<navigator wx:if="{{disabled}}" url="#" class="but" bindtap="insetr">
+  <view class="count">
+    经销商
+  </view>
+  <view class="expand">
+    <van-search wx:if="{{showSearch}}" custom-class='custom-class' focus='{{focus}}' value="{{ condition }}" shape="round" bind:change='onChange' bind:search='onSearch' bind:clear='onSearch' placeholder="搜索关键词" background='#F4F5F7' />
+    <navigator url="#" class="but" bindtap="toSearch">
+      <van-icon name="search" />
+    </navigator>
+    <!-- <navigator wx:if="{{disabled}}" url="#" class="but" bindtap="insetr">
 			<van-icon name="plus" />
-		</navigator>
-	</view>
+		</navigator> -->
+  </view>
 </view>
 <navigator url="/prsx/dealer/detail?id={{item.sa_agentsid}}" class="project-item global-card" wx:for="{{list}}" wx:key="sa_agentsid">
-	<navigator class="delete" url="#" data-item="{{item}}" catch:tap="deleteItem">
-		<text class="iconfont icon-shanchu1"></text>
-	</navigator>
-	<view class="label">
-		<view class="title line-1">{{item.enterprisename}}</view>
-		<!-- <view class="state" style="background-color: {{sColors[item.status]}}">{{item.status}}</view> -->
-	</view>
-	<view class="tag-box">
-		<view class="systemtag" wx:for="{{item.tag_sys}}" wx:key="item">{{language[item]||item}}</view>
-		<view class="datatag" wx:for="{{item.tag}}" wx:key="item">{{language[item]||item}}</view>
-	</view>
-	<view class="replenish">
-		<text style="color: #666;">编号：</text>
-		<text>{{item.agentnum || ' --'}}</text>
-	</view>
-	<view class="replenish">
-		<text style="color: #666;">合作状态：</text>
-		<text>{{item.cooperatetype || ' --'}}</text>
-	</view>
-	<view class="replenish">
-		<text style="color: #666;">营销区域：</text>
-		<text>{{item.areanames || ' --'}}</text>
-	</view>
-	<view class="replenish">
-		<text style="color: #666;">省市县：</text>
-		<text>{{item.province + item.city +item.county  || ' --'}}</text>
-	</view>
-	<view class="replenish">
-		<text style="color: #666;">总经理：</text>
-		<text>{{item.gmname || ' --'}}</text>
-	</view>
-	<view class="replenish">
-		<text style="color: #666;">业务员：</text>
-		<text>{{item.salernames || ' --'}}</text>
-	</view>
-	<view class="replenish">
-		<text style="color: #666;">备注：</text>
-		<text>{{item.remarks || ' --'}}</text>
-	</view>
+  <navigator class="delete" url="#" data-item="{{item}}" catch:tap="deleteItem">
+    <text class="iconfont icon-shanchu1"></text>
+  </navigator>
+  <view class="label">
+    <view class="title line-1">{{item.enterprisename}}</view>
+    <!-- <view class="state" style="background-color: {{sColors[item.status]}}">{{item.status}}</view> -->
+  </view>
+  <view class="tag-box">
+    <view class="systemtag" wx:for="{{item.tag_sys}}" wx:key="item">{{language[item]||item}}</view>
+    <view class="datatag" wx:for="{{item.tag}}" wx:key="item">{{language[item]||item}}</view>
+  </view>
+  <view class="replenish">
+    <text style="color: #666;">编号：</text>
+    <text>{{item.agentnum || ' --'}}</text>
+  </view>
+  <view class="replenish">
+    <text style="color: #666;">合作状态：</text>
+    <text>{{item.cooperatetype || ' --'}}</text>
+  </view>
+  <view class="replenish">
+    <text style="color: #666;">营销区域：</text>
+    <text>{{item.areanames || ' --'}}</text>
+  </view>
+  <view class="replenish">
+    <text style="color: #666;">省市县：</text>
+    <text>{{item.province + item.city +item.county  || ' --'}}</text>
+  </view>
+  <view class="replenish">
+    <text style="color: #666;">总经理：</text>
+    <text>{{item.gmname || ' --'}}</text>
+  </view>
+  <view class="replenish">
+    <text style="color: #666;">业务员：</text>
+    <text>{{item.salernames || ' --'}}</text>
+  </view>
+  <view class="replenish">
+    <text style="color: #666;">备注：</text>
+    <text>{{item.remarks || ' --'}}</text>
+  </view>
 </navigator>
 <My_empty wx:if="{{list.length==0}}" />
 
 
 <wxs module="render">
-	module.exports = {
-		rightRate: function (rate) {
-			if (rate - 0 < 50) {
-				return 'transform: rotate(' + 3.6 * (rate - 0) + 'deg);';
-			} else {
-				return 'transform: rotate(0);border-color: var(--assist);';
-			}
-		},
-		leftRate: function (rate) {
-			if (rate - 0 >= 50) {
-				return 'transform: rotate(' + 3.6 * (rate - 50) + 'deg);';
-			}
-		}
-	}
+  module.exports = {
+    rightRate: function (rate) {
+      if (rate - 0 < 50) {
+        return 'transform: rotate(' + 3.6 * (rate - 0) + 'deg);';
+      } else {
+        return 'transform: rotate(0);border-color: var(--assist);';
+      }
+    },
+    leftRate: function (rate) {
+      if (rate - 0 >= 50) {
+        return 'transform: rotate(' + 3.6 * (rate - 50) + 'deg);';
+      }
+    }
+  }
 </wxs>

prsx/hospital/Department/index.wxml

@@ -9,7 +9,7 @@
 		</navigator>
 		<navigator wx:if="{{disabled}}" url="#" class="but" bindtap="insetr">
 			<van-icon name="plus" />
-		</navigator>
+		</navigator> 
 	</view>
 </view>
 <navigator url="/prsx/department/detail?id={{item.sa_hospitaldepid}}" class="project-item" wx:for="{{list}}" wx:key="sa_hospitaldepid">

prsx/hospital/detail.js

@@ -247,7 +247,7 @@ Page({
         label: "详细信息",
         icon: "icon-tabxiangxixinxi1"
       }, {
-        label: "签约经销商",
+        label: "关联经销商",
         icon: "icon-jingxiaoshang",
         model: "#Dealer"
       }, {

prsx/hospital/detail.wxml

@@ -19,7 +19,7 @@
     <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
     <Trace resource='医院管理' slot='跟进动态' id='Trace' ownertable='sa_customers' ownerid='{{sa_customersid}}' disabled="{{detail.status != '已终止'}}" ownerid1='{{detail.sys_enterpriseid}}' />
     <Address slot='地址管理' id='Address' disabled="{{(per.query(appAuth.options,'address')||isAdmin||isLeader)&& detail.status != '已终止'}}" />
-    <Dealer slot='签约经销商' id='Dealer' />
+    <Dealer slot='关联经销商' id='Dealer' />
     <Doctors slot='医生' id='Doctors' disabled="{{isLeader}}" />
     <!-- <Surgery slot='预估手术量' id='Surgery' disabled="{{isLeader}}" /> -->
     <Contract slot='合同' id='Contract' />

prsx/select/product/index.js

@@ -8,6 +8,26 @@ Page({
         idname: "itemid", //idkey
         showName: "enterprisename", //表单用 显示名称
         sColors: getApp().globalData.sColors,
+        active: "Receive",
+        filterShow:true,
+        filtratelist:[ {
+          label: "阅读状态",
+          index: null,
+          showName: "name", //显示字段
+          valueKey: "readstatus", //返回Key
+          selectKey: "value", //传参 代表选着字段 不传参返回整个选择对象
+          value: "", //选中值
+          list: [{
+              name: "全部",
+              value: ""
+          }, {
+              name: "已读",
+              value: "1"
+          }, {
+              name: "未读",
+              value: "0"
+          }]
+      }]
     },
     onLoad(options) {
         if (options.params) {
@@ -130,4 +150,25 @@ Page({
         //回收数据
         getApp().globalData.handleSelect = null;
     },
+    /* 筛选 */
+    handleFilter({
+      detail
+  }) {
+      detail.condition = this.data.where.condition;
+      detail.today = 0
+      detail.lastthreedays = 0
+      detail.lastWeek = 0
+      if (detail.date) detail[detail.date] = 1;
+      detail.begindate = detail.startdate || ''
+      this.data.where = detail;
+
+      this.selectComponent("#" + this.data.active).getList(true);
+  },
+  onClick() {
+    console.log('执行11111')
+      this.setData({
+          filterShow: true
+      })
+      console.log(this.filterShow,'返回结果')
+  }
 })

static/stylesheet.wxss

@@ -249,3 +249,7 @@
 .icon-shijian:before {
   content: "\e702";
 }
+
+.icon-yiyuan1:before {
+  content: "\e717";
+}

utils/work/apps.js

@@ -58,17 +58,17 @@ function getcrm() {
 	}, {
 		name: "医院管理",
 		path: "/prsx/hospital/index",
-		icon: "work-kehu",
+		icon: "work-yiyuanguanli",
 		objectname: "sa_customers"
 	}, {
 		name: "科室管理",
 		path: "/prsx/department/index",
-		icon: "work-kehu",
+		icon: "work-keshiguanli",
 		objectname: "sa_hospitaldep"
 	}, {
 		name: "医生管理",
 		path: "/prsx/doctors/index",
-		icon: "work-kehu",
+		icon: "work-yishengguanli",
 		objectname: "sa_doctor"
 	}, {
 		name: "合同管理",
@@ -88,17 +88,17 @@ function getcrm() {
 	}, {
 		name: "经销商管理",
 		path: "/prsx/dealer/index",
-		icon: "work-dingdan",
+		icon: "work-jingxiaoshangguanli",
 		objectname: "sa_agents"
 	}, {
 		name: "安装确认",
 		path: "/prsx/winstall/index",
-		icon: "work-dingdan",
+		icon: "work-anzhuangqueren",
 		objectname: "sa_install"
 	}, {
 		name: "试用申请",
 		path: "/prsx/tryOut/index",
-		icon: "work-dingdan",
+		icon: "work-shiyongshenqing",
 		objectname: "sa_trial"
 	}];
 	let crm = getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['CRM'], ['业务管理', '销售管理', '营销目标']),

utils/work/work-icon.wxss

@@ -1,290 +1,313 @@
 @import "./work.wxss";
 
 .work {
-    font-family: "work" !important;
-    font-size: 16px;
-    font-style: normal;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+  font-family: "work" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
+.work-yiyuanguanli:before {
+  content: "\e710";
+}
+
+.work-jingxiaoshangguanli:before {
+  content: "\e71b";
+}
+
+.work-shiyongshenqing:before {
+  content: "\e71a";
+}
+
+.work-anzhuangqueren:before {
+  content: "\e719";
+}
+
+.work-yishengguanli:before {
+  content: "\e718";
+}
+
+.work-keshiguanli:before {
+  content: "\e717";
+}
 
 .work-xiaoshoushuju:before {
-    content: "\e625";
+  content: "\e625";
 }
 
 .work-shujutongji:before {
-    content: "\e626";
+  content: "\e626";
 }
 
 .work-qiandao:before {
-    content: "\e615";
+  content: "\e615";
 }
 
 .work-renwu:before {
-    content: "\e612";
+  content: "\e612";
 }
 
 .work-yingshouzhangkuan:before {
-    content: "\e6f1";
+  content: "\e6f1";
 }
 
 .work-webshoucang:before {
-    content: "\e68a";
+  content: "\e68a";
 }
 
 .work-kehuhuaxiang:before {
-    content: "\e699";
+  content: "\e699";
 }
 
 .work-xiangmuchengjiaoyuce:before {
-    content: "\e69a";
+  content: "\e69a";
 }
 
 .work-xiangmuchengjiaoyuceguanli:before {
-    content: "\e69b";
+  content: "\e69b";
 }
 
 .work-xiangmuhuaxiang:before {
-    content: "\e69c";
+  content: "\e69c";
 }
 
 .work-chuhuokaipiaoyuce:before {
-    content: "\e69d";
+  content: "\e69d";
 }
 
 .work-chuhuokaipiaoyuceguanli:before {
-    content: "\e69e";
+  content: "\e69e";
 }
 
 .work-xiaoshouloudou:before {
-    content: "\e69f";
+  content: "\e69f";
 }
 
 .work-yewuyuanhuaxiang:before {
-    content: "\e6a0";
+  content: "\e6a0";
 }
 
 .work-zuoyekanban:before {
-    content: "\e697";
+  content: "\e697";
 }
 
 .work-gongzuohuibao:before {
-    content: "\e601";
+  content: "\e601";
 }
 
 .work-xiaoxigundong:before {
-    content: "\e674";
+  content: "\e674";
 }
 
 .work-shenqingdan:before {
-    content: "\e686";
+  content: "\e686";
 }
 
 .work-gongdan:before {
-    content: "\e687";
+  content: "\e687";
 }
 
 .work-yewuyuanfuwushenqingdan:before {
-    content: "\e688";
+  content: "\e688";
 }
 
 .work-shenqingdanguanli:before {
-    content: "\e689";
+  content: "\e689";
 }
 
 .work-jujianfeijiesuan:before {
-    content: "\e684";
+  content: "\e684";
 }
 
 .work-dakuanpingzheng:before {
-    content: "\e685";
+  content: "\e685";
 }
 
 .work-yingxiaogongju:before {
-    content: "\e683";
+  content: "\e683";
 }
 
 .work-a-shangxueyuanxuexi:before {
-    content: "\e63d";
+  content: "\e63d";
 }
 
 .work-a-tibaoguanlitibao:before {
-    content: "\e63f";
+  content: "\e63f";
 }
 
 .work-xiaochengxu_xiaoshouyuce:before {
-    content: "\e68e";
+  content: "\e68e";
 }
 
 .work-gouwuche:before {
-    content: "\e682";
+  content: "\e682";
 }
 
 .work-a-woderenwuzhongxin:before {
-    content: "\e649";
+  content: "\e649";
 }
 
 .work-a-wodemendianxinxidizhi:before {
-    content: "\e64b";
+  content: "\e64b";
 }
 
 .work-xiaochengxutongxunlu:before {
-    content: "\e68c";
+  content: "\e68c";
 }
 
 .work-xiaoshouxiansuo:before {
-    content: "\e680";
+  content: "\e680";
 }
 
 .work-xiaochengxu_xiaoshoumubiao:before {
-    content: "\e68d";
+  content: "\e68d";
 }
 
 .work-tianjialianxiren:before {
-    content: "\e690";
+  content: "\e690";
 }
 
 .work-a-shouyejingangqushangxueyuan:before {
-    content: "\e60d";
+  content: "\e60d";
 }
 
 .work-a-shouyejingangquhehuoren:before {
-    content: "\e60e";
+  content: "\e60e";
 }
 
 .work-a-shouyejingangqutongxunlu:before {
-    content: "\e610";
+  content: "\e610";
 }
 
 .work-a-shouyejingangqutonggao:before {
-    content: "\e613";
+  content: "\e613";
 }
 
 .work-a-shouyejingangqutuiguangsucai:before {
-    content: "\e614";
+  content: "\e614";
 }
 
 .work-a-shouyejingangquxiaoshouxiansuo:before {
-    content: "\e616";
+  content: "\e616";
 }
 
 .work-a-shouyejingangqutibao:before {
-    content: "\e617";
+  content: "\e617";
 }
 
 .work-a-shouyejingangquyingxiaowuliao:before {
-    content: "\e618";
+  content: "\e618";
 }
 
 .work-webshangxueyuan:before {
-    content: "\e665";
+  content: "\e665";
 }
 
 .work-webtonggaoguanli:before {
-    content: "\e666";
+  content: "\e666";
 }
 
 .work-webtibaoguanli:before {
-    content: "\e667";
+  content: "\e667";
 }
 
 .work-webyingxiaowuliao:before {
-    content: "\e668";
+  content: "\e668";
 }
 
 .work-kehu:before {
-    content: "\e6ba";
+  content: "\e6ba";
 }
 
 .work-hetong:before {
-    content: "\e6bb";
+  content: "\e6bb";
 }
 
 .work-xiangmubaojia:before {
-    content: "\e6bc";
+  content: "\e6bc";
 }
 
 .work-gonghaikehu:before {
-    content: "\e6bd";
+  content: "\e6bd";
 }
 
 .work-xiangmushangji:before {
-    content: "\e6be";
+  content: "\e6be";
 }
 
 .work-jingzhengduishou:before {
-    content: "\e6c4";
+  content: "\e6c4";
 }
 
 .work-shichanghuodong:before {
-    content: "\e6c5";
+  content: "\e6c5";
 }
 
 .work-gonghaixiansuo:before {
-    content: "\e6c6";
+  content: "\e6c6";
 }
 
 .work-zuijinshiyong:before {
-    content: "\e6df";
+  content: "\e6df";
 }
 
 .work-tongyong:before {
-    content: "\e6e0";
+  content: "\e6e0";
 }
 
 .work-E-dingdan:before {
-    content: "\e6e1";
+  content: "\e6e1";
 }
 
 .work-CRM:before {
-    content: "\e6e2";
+  content: "\e6e2";
 }
 
 .work-E-fuwu:before {
-    content: "\e6e3";
+  content: "\e6e3";
 }
 
 .work-a-biaoqianlanshouyexuanzhong:before {
-    content: "\e606";
+  content: "\e606";
 }
 
 .work-shouhuo:before {
-    content: "\e677";
+  content: "\e677";
 }
 
 .work-dingdan:before {
-    content: "\e678";
+  content: "\e678";
 }
 
 .work-zhanghu:before {
-    content: "\e679";
+  content: "\e679";
 }
 
 .work-kaipiao:before {
-    content: "\e67a";
+  content: "\e67a";
 }
 
 .work-tuifan:before {
-    content: "\e67b";
+  content: "\e67b";
 }
 
 .work-shangcheng:before {
-    content: "\e67c";
+  content: "\e67c";
 }
 
 .work-shujuchaxun:before {
-    content: "\e67d";
+  content: "\e67d";
 }
 
 .work-cuxiaohuodong:before {
-    content: "\e67e";
+  content: "\e67e";
 }
 
 .work-yejimubiao:before {
-    content: "\e67f";
+  content: "\e67f";
 }
 
 .work-gongjuchaxun:before {
-    content: "\e681";
+  content: "\e681";
 }