姜永辉 2 лет назад
Родитель
Сommit
893b10e9a1
29 измененных файлов с 529 добавлено и 9 удалено
  1. 1 1
      api/pages/core/staff.js
  2. 6 0
      app.json
  3. 66 0
      package-basic-data/pages/org/add/add.js
  4. 3 0
      package-basic-data/pages/org/add/add.json
  5. 2 0
      package-basic-data/pages/org/add/add.wxml
  6. 1 0
      package-basic-data/pages/org/add/add.wxss
  7. 66 0
      package-basic-data/pages/org/detail/detail.js
  8. 3 0
      package-basic-data/pages/org/detail/detail.json
  9. 2 0
      package-basic-data/pages/org/detail/detail.wxml
  10. 1 0
      package-basic-data/pages/org/detail/detail.wxss
  11. 66 0
      package-basic-data/pages/org/org.js
  12. 3 0
      package-basic-data/pages/org/org.json
  13. 2 0
      package-basic-data/pages/org/org.wxml
  14. 1 0
      package-basic-data/pages/org/org.wxss
  15. 66 0
      package-basic-data/pages/staff/add/add.js
  16. 3 0
      package-basic-data/pages/staff/add/add.json
  17. 2 0
      package-basic-data/pages/staff/add/add.wxml
  18. 1 0
      package-basic-data/pages/staff/add/add.wxss
  19. 66 0
      package-basic-data/pages/staff/detail/detail.js
  20. 3 0
      package-basic-data/pages/staff/detail/detail.json
  21. 2 0
      package-basic-data/pages/staff/detail/detail.wxml
  22. 1 0
      package-basic-data/pages/staff/detail/detail.wxss
  23. 126 0
      package-basic-data/pages/staff/staff.js
  24. 6 0
      package-basic-data/pages/staff/staff.json
  25. 22 0
      package-basic-data/pages/staff/staff.wxml
  26. 0 0
      package-basic-data/pages/staff/staff.wxss
  27. 2 2
      package-basic-data/pages/test/test.js
  28. 2 2
      pages/index/index.js
  29. 4 4
      pages/login/login.js

+ 1 - 1
api/pages/core/staff.js

@@ -23,7 +23,7 @@ module.exports = {
           // 跟进任务
           followTask: { key: 'followTask', url: '/package3/pages/follow-up-tasks/follow-up-tasks', image: '/static/img/followTask.png' },
           // 销售订单
-          order: { key: 'order', url: '/package4/pages/order-billing/choose-goods/choose-goods', image: '/static/img/order.png', valid: true },
+          order: { key: 'order', url: '/package-sales/pages/order-billing/order-billing', image: '/static/img/order.png', valid: true },
           // 客户收款
           collection: { key: 'collection', url: '/package4/pages/order-billing/customer-collection/add/add', image: '/static/img/receive.png' },
           // 客户合并

+ 6 - 0
app.json

@@ -14,6 +14,12 @@
             "pages": [
                 "pages/test/test",
                 "pages/test/add/add",
+                "pages/org/org",
+                "pages/org/add/add",
+                "pages/org/detail/detail",
+                "pages/staff/staff",
+                "pages/staff/add/add",
+                "pages/staff/detail/detail",
                 "pages/basic-data/basic-data",
                 "pages/product-file/product-file",
                 "pages/product-file/add/add",

+ 66 - 0
package-basic-data/pages/org/add/add.js

@@ -0,0 +1,66 @@
+// package-basic-data/pages/org/add/add.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

+ 3 - 0
package-basic-data/pages/org/add/add.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

+ 2 - 0
package-basic-data/pages/org/add/add.wxml

@@ -0,0 +1,2 @@
+<!--package-basic-data/pages/org/add/add.wxml-->
+<text>package-basic-data/pages/org/add/add.wxml</text>

+ 1 - 0
package-basic-data/pages/org/add/add.wxss

@@ -0,0 +1 @@
+/* package-basic-data/pages/org/add/add.wxss */

+ 66 - 0
package-basic-data/pages/org/detail/detail.js

@@ -0,0 +1,66 @@
+// package-basic-data/pages/org/detail/detail.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

+ 3 - 0
package-basic-data/pages/org/detail/detail.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

+ 2 - 0
package-basic-data/pages/org/detail/detail.wxml

@@ -0,0 +1,2 @@
+<!--package-basic-data/pages/org/detail/detail.wxml-->
+<text>package-basic-data/pages/org/detail/detail.wxml</text>

+ 1 - 0
package-basic-data/pages/org/detail/detail.wxss

@@ -0,0 +1 @@
+/* package-basic-data/pages/org/detail/detail.wxss */

+ 66 - 0
package-basic-data/pages/org/org.js

@@ -0,0 +1,66 @@
+// package-basic-data/pages/org/org.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

+ 3 - 0
package-basic-data/pages/org/org.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

+ 2 - 0
package-basic-data/pages/org/org.wxml

@@ -0,0 +1,2 @@
+<!--package-basic-data/pages/org/org.wxml-->
+<text>package-basic-data/pages/org/org.wxml</text>

+ 1 - 0
package-basic-data/pages/org/org.wxss

@@ -0,0 +1 @@
+/* package-basic-data/pages/org/org.wxss */

+ 66 - 0
package-basic-data/pages/staff/add/add.js

@@ -0,0 +1,66 @@
+// package-basic-data/pages/staff/add/add.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

+ 3 - 0
package-basic-data/pages/staff/add/add.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

+ 2 - 0
package-basic-data/pages/staff/add/add.wxml

@@ -0,0 +1,2 @@
+<!--package-basic-data/pages/staff/add/add.wxml-->
+<text>package-basic-data/pages/staff/add/add.wxml</text>

+ 1 - 0
package-basic-data/pages/staff/add/add.wxss

@@ -0,0 +1 @@
+/* package-basic-data/pages/staff/add/add.wxss */

+ 66 - 0
package-basic-data/pages/staff/detail/detail.js

@@ -0,0 +1,66 @@
+// package-basic-data/pages/staff/detail/detail.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

+ 3 - 0
package-basic-data/pages/staff/detail/detail.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

+ 2 - 0
package-basic-data/pages/staff/detail/detail.wxml

@@ -0,0 +1,2 @@
+<!--package-basic-data/pages/staff/detail/detail.wxml-->
+<text>package-basic-data/pages/staff/detail/detail.wxml</text>

+ 1 - 0
package-basic-data/pages/staff/detail/detail.wxss

@@ -0,0 +1 @@
+/* package-basic-data/pages/staff/detail/detail.wxss */

+ 126 - 0
package-basic-data/pages/staff/staff.js

@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * Copyright(c) 2022 dongke All rights reserved. / Confidential
+ * 类的信息:
+ *		1.程序名称:
+ *		2.员工资料列表
+ * 编辑履历:
+ *		作者				日期					版本				修改内容
+ *		于继渤		        2022-0-12	            1.00		   	    
+ *******************************************************************************/
+const Constants = require('@/utils/Constants.js');
+const util = require('@/utils/util.js')
+const mixins = require('@/mixins/index.js')
+const app = getApp()
+Page({
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    // 查询条件
+    searchContent: [{ code: 'createtime', title: '近30天', defaultValue: 5, searchType: Constants.searchType.date }, { code: 'org', title: '业务部门', dropType: 'org' }, { code: 'status', title: '订单状态', searchType: Constants.searchType.switch, list: [{ code: '审-异常', title: '异常' }, { code: '审-待审', title: '待审' }] }, { code: 'choose', title: '筛选', searchType: Constants.searchType.pick }],
+
+    // 查询条件-筛选
+    pullMenuList: [{ code: 'outStatus', pullType: 'mSelect', typeName: 'outStatus' }, { code: 'receiveStatus', pullType: 'mSelect', typeName: 'receiveStatus' }, { code: 'followCount', dataType: 'number' }, { code: 'nextFollowTime', dataType: 'date' }], 
+
+    // 列表区(内容)
+    contentList: [{ name: 'staffCode', title: '员工编码' }, { name: 'staffPhone', title: '员工电话' }, { name: 'orgName', title: '业务部门' }],
+
+    // 列表区(脚部金额)
+    footerAmount: { name: 'cpId', title: '合计金额' },
+    // 列表区(脚部信息)
+    footerInfo: [{ name: 'cpId', title: '跟进 共' }, { name: 'cpId', title: '件' }],
+
+    // 列表区(内容变动-如果没有删除属性)
+    contentObj: {
+      'false': [{ name: 'staffCode', title: '员工编码1' }, { name: 'staffPhone', title: '员工电话1', phone: true }, { name: 'orgName', title: '业务部门' }],
+      'true': [{ name: 'staffCode', title: '员工编码2' }, { name: 'staffPhone', title: '员工电话2', phone: true }, { name: 'orgName', title: '业务部门' }]
+    },
+
+    // 弹出按钮
+    buttonList: [ { name: 'order', title: '销售订单' },
+    { name: 'collection', title: '客户收款' }, { name: 'merge', title: '客户合并' }],
+
+    totallength: 0, //视图下方提醒数量
+
+    // 路由
+    routeObjName: 'staff',
+  },
+  /**
+   * 跳转客户详细
+   */
+  toDetail(e) {
+    let ID = e.currentTarget.dataset.item.staffId
+    this.setData({
+      selectflag: true
+    })
+    wx.navigateTo({
+      url: './detail/detail?ID=' + ID,
+    })
+  },
+  toTitle(e) {
+    console.log('t1', e);
+  },
+  toStatus(e) {
+    console.log('t2', e);
+  },
+  toPoint(e) {
+    console.log('t3', e);
+    this.setData({
+      showShare: true
+    })
+  },
+  toAdd() {
+    wx.navigateTo({
+      url: './add/add',
+    })
+  },
+  /**
+   * @desc : 校验
+   * @date : 2024/2/1 15:49
+   * @author : 周兴
+   */
+  openValidData(item, name) {
+    console.log('item', item, name, item.staffId);
+    if (!item.staffId) {
+      wx.showToast({
+        title: '无此联系人,或陌生接待',
+        icon: 'none'
+      })
+      return false;
+    }
+    return true;
+  },
+
+  /**
+   * @desc : 查询
+   * @date : 2024/2/1 15:49
+   * @author : 周兴
+   */
+  getData(params) {
+    return this.excute(this.data.service, this.data.service.selectByCond, params);
+  },
+
+  /**
+   *  如果页面需要后续处理,再进行处理
+   */
+  handleData(data) { 
+    // 员工的数量
+    this.setData({
+      totallength: data.length
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    //按钮权限 
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  },
+})

+ 6 - 0
package-basic-data/pages/staff/staff.json

@@ -0,0 +1,6 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "员工列表",
+    "enablePullDownRefresh": true,
+    "backgroundTextStyle": "light"
+  }

+ 22 - 0
package-basic-data/pages/staff/staff.wxml

@@ -0,0 +1,22 @@
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<!-- 加载图层 -->
+<loading wx:if="{{loading}}"></loading>
+<!-- 粘性布局的查询条件 -->
+<van-sticky scroll-top="0">
+  <!-- 查询条件 -->
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','telephone'])}}">
+  </dk-dropdown-menu>
+</van-sticky>
+
+<!-- 暂无数据 -->
+<van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}" /> 
+
+<!-- 列表区 -->
+<dk-list list="{{tableData}}" titleCorner="orgName" title="staffName" status="flgCanLogin"   collectCol="collectAmount" collectName="收款" subTitle="orgName" content="{{contentList}}" contentObj="{{contentObj}}" contentCol="flgCanLogin" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
+
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}</van-divider>
+<view style="height: 135rpx;"></view>
+
+<!-- 新建按钮 -->
+<dk-save-bottom flagTypeName="customers" totallength="{{totallength}}" bind:submit="toAdd" />

+ 0 - 0
package-basic-data/pages/staff/staff.wxss


+ 2 - 2
package-basic-data/pages/test/test.js

@@ -18,7 +18,7 @@ Page({
    */
   data: {
     // 查询条件
-    searchContent: [{ code: 'createtime', title: '近30天', defaultValue: 5, searchType: Constants.searchType.date }, { code: 'staff', title: '业务员', dropType: 'staff' }, { code: 'status', title: '订单状态', searchType: Constants.searchType.switch, list: [{ code: '审-异常', title: '异常' }, { code: '审-待审', title: '待审' }] }, { code: 'choose', title: '筛选', searchType: Constants.searchType.pick }],
+    searchContent: [{ code: 'createtime', title: '近30天', defaultValue: 5, searchType: Constants.searchType.date }, { code: 'org', title: '业务部门', dropType: 'org' }, { code: 'status', title: '订单状态', searchType: Constants.searchType.switch, list: [{ code: '审-异常', title: '异常' }, { code: '审-待审', title: '待审' }] }, { code: 'choose', title: '筛选', searchType: Constants.searchType.pick }],
 
     // 查询条件-筛选
     pullMenuList: [{ code: 'outStatus', pullType: 'mSelect', typeName: 'outStatus' }, { code: 'receiveStatus', pullType: 'mSelect', typeName: 'receiveStatus' }, { code: 'followCount', dataType: 'number' }, { code: 'nextFollowTime', dataType: 'date' }], 
@@ -38,7 +38,7 @@ Page({
     },
 
     // 弹出按钮
-    buttonList: [{ name: 'follow' }, { name: 'followTask', title: '跟进任务' }, { name: 'order', title: '销售订单' },
+    buttonList: [ { name: 'order', title: '销售订单' },
     { name: 'collection', title: '客户收款' }, { name: 'merge', title: '客户合并' }],
 
     totallength: 0, //视图下方提醒数量

+ 2 - 2
pages/index/index.js

@@ -409,14 +409,14 @@ Page({
       },
       {
         FunctionName: '部门档案',
-        FormName: '/package4/pages/order-billing/customer-collection/customer-collection',
+        FormName: '/package-basic-data/pages/org/org',
         ImageUri: '/static/img/inventory-query.png',
         PFunctionCode: '07',
         FunctionCode: '0702'
       },
       {
         FunctionName: '员工档案',
-        FormName: '/package4/pages/order-billing/customer-collection/customer-collection',
+        FormName: '/package-basic-data/pages/staff/staff',
         ImageUri: '/static/img/collection.png',
         PFunctionCode: '07',
         FunctionCode: '0703'

+ 4 - 4
pages/login/login.js

@@ -75,7 +75,7 @@ Page({
   getopenid(param) {
     let _this = this
     api.request(Constants.SYS_OPENID_API + 'oauth/wx/login_wechat', 'POST', param).then(login_res => {
-      if (login_res.data.code === 200) {
+      if (login_res.data.code === Constants.SUCESS_COD) {
         app.globalData.openid = login_res.data.data.openid
         app.globalData.unionid = login_res.data.data.unionid
         app.globalData.sessionkey = login_res.data.data.session_key
@@ -93,7 +93,7 @@ Page({
     //  调用接口
     _this.getTokenPromise().then(res => {
       console.log("gettoken", res);
-      if (res.data.code === 200) {
+      if (res.data.code === Constants.SUCESS_COD) {
         // 调转主页
         wx.reLaunch({
           url: '../../pages/home-page/home-page',
@@ -136,7 +136,7 @@ Page({
     let _this = this
     api.request(Constants.SYS_OPENID_API + 'oauth/wx/register', 'POST', param).then(res => {
       console.log("register", res);
-      if (res.data.code === 200) {
+      if (res.data.code === Constants.SUCESS_COD) {
         app.globalData.userInfo = res.data.userInfo
         wx.reLaunch({
           url: '../../pages/home-page/home-page',
@@ -168,7 +168,7 @@ Page({
     }
     api.request(Constants.SYS_OPENID_API + 'oauth/wx/decrypt', 'POST', param).then(res => {
       console.log("decrypt", res);
-      if (res.data.code === 200) {
+      if (res.data.code === Constants.SUCESS_COD) {
         app.globalData.phoneNumber = res.data.phoneNumber        
       }
     })