姜永辉 2 سال پیش
والد
کامیت
1fb4a100e8

+ 22 - 0
api/pages/other/oauth.js

@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright(c) 2024 dongke All rights reserved. / Confidential
+ * 类的信息:
+ *		1.程序名称:
+ *		2.功能描述:权限方法
+ * 编辑履历:
+ *		作者				日期					版本				修改内容
+ *		jyh		  	     2024-1-19       			1.00		       	新建
+ *******************************************************************************/
+module.exports = {
+    oauthService: {
+        // 前缀
+        prefix: 'oauth-server/',
+        wxByOpenId:'oauth/wx/openid'
+    },
+
+    routeUrl: {
+        oauth: {
+             
+        }
+    }
+};

+ 1 - 1
package-basic-data/pages/staff/add/add.js

@@ -18,7 +18,7 @@ Page({
     cardList: ['main'],
     contentObj: {
       main: [
-        { code: 'staffCode', type: 'str', required: true, title: mixins.$t('staffCode') },
+        { code: 'staffCode', type: 'str', readonly:true, title: mixins.$t('staffCode') },
         { code: 'staffName', type: 'str', required: true, title: mixins.$t('staffName') },
         { code: 'staffPhone', type: 'phone', title: mixins.$t('staffPhone'), required: true },
         { code: 'orgId', name: 'orgName', type: 'drop', required: true, dropType: 'org' },

+ 111 - 69
package-basic-data/pages/staff/detail/detail.js

@@ -1,80 +1,122 @@
-// package-basic-data/pages/staff/detail/detail.js
+/*******************************************************************************
+ * Copyright(c) 2022 dongke All rights reserved. / Confidential
+ * 类的信息:
+ *		1.程序名称:
+ *		2.员工资料-邀请员工
+ * 编辑履历:
+ *		作者				日期					版本				修改内容
+ *		admin		   2024-2-12	   1.00		   	    
+ *******************************************************************************/
+const mixins = require('@/mixins/index.js')
+const Constants = require('@/utils/Constants')
 Page({
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    cardList: ['main'],
+    contentObj: {
+      main: [
+        { code: 'staffCode', type: 'str', readonly: true, title: mixins.$t('staffCode') },
+        { code: 'staffName', type: 'str', required: true, title: mixins.$t('staffName') },
+        { code: 'staffPhone', type: 'phone', title: mixins.$t('staffPhone'), required: true },
+        { code: 'orgId', name: 'orgName', type: 'drop', required: true, dropType: 'org' },
+        { code: 'roleId', name: 'roleName', type: 'mutidrop', required: false, dropType: 'role' },
+        { code: 'flgCanLogin', type: 'checkbox', title: mixins.$t('flgCanLogin') },
+        { code: 'remarks', type: 'textarea', title: mixins.$t('remarks') }
+      ]
+    },
+    // 路由
+    routeObjName: 'staff',
+    oauthService: app.globalData['oauthService']
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        treeList: [
-            {
-                id: '1',
-                pid: '0',
-                name: '祖先节点',
-                nodes: [
-                    {
-                        id: '1-1',
-                        pid: '1',
-                        name: '父节点1',
-                        nodes: [
-                            {
-                                id: '1-1-1',
-                                pid: '1-1',
-                                name: '子节点1',
-                                nodes: []
-                            }
-                        ]
-                    },
-                    {
-                        id: '1-2',
-                        pid: '1',
-                        name: '父节点2',
-                        nodes: [
-                            {
-                                id: '1-1-2',
-                                pid: '1-1',
-                                name: '子节点2',
-                                nodes: []
-                            }
-                        ]
-                    }
-                ]
-            }
-        ],
+  },
+  /**
+   * @desc   : 处理数据-保存和查询后的逻辑
+   * @author : 姜永辉
+   * @date   : 2024/1/26 11:46
+   */
+  handleData() {
+    wx.navigateBack({
+      data: 1
+    })
+  },
 
-    },
+  /**
+  * @desc : 保存的參數設置
+  * @date : 2024/2/1 15:49
+  * @author : 姜永辉
+  */
+  setParams(params) {
+    params.roleIds = (params.roleIds && params.roleIds.length > 0) ? params.roleIds.split(',') : []
+    return params
+  },
 
-    treeClick(e) {
-        console.log(e)
-        const t = this.selectAllComponents('#treeSelect');
-        t.forEach(item => {
-            item.click(e);
-            console.log(e.detail)
-        })
-        const {
-            id,
-            value
-        } = e.detail;
-        console.log(e.detail)
-    },
+  /**
+  * @desc : 保存数据服务
+  * @date : 2024/2/1 15:49
+  * @author : 姜永辉
+  */
+  saveData() {
+    if (this.data.formMode == Constants.formMode.edit) {
+      return this.excute(this.data.service, this.data.service.update, this.data.params)
+    } else {
+      return this.excute(this.data.service, this.data.service.insert, this.data.params)
+    }
 
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
+  },
 
-    },
+  /**
+   * @desc :   处理接口返回数据
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  handleSearchData(tableData) {
+    console.log("handleSearchData", tableData);
+  },
+  /**
+   * @desc : 给表单赋值
+   * @date : 2024/2/1 15:49
+   * @author : 姜永辉
+   */
+  setValuesByEdit(data) {
+    console.log("setValuesByEdit", data);
+    this.setData({
+      formData: JSON.stringify(data)
+    })
+  },
 
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
+  /**
+  * @desc : 查询的參數設置
+  * @date : 2024/2/1 15:49
+  * @author : 姜永辉
+  */
+  setSearchParams(params) {
+    console.log("setSearchParams", params);
+    return params
+  },
 
-    },
+  /**
+   * @desc : 查询-根据openid
+   * @date : 2024/2/1 15:49
+   * @author : 姜永辉
+   */
+  getData(params) {
+    return this.excute(this.data.oauthService, this.data.oauthService.wxByOpenId, params);
+  },
 
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
+  /**
+  * 生命周期函数--监听页面加载
+  */
+  onLoad: function (options) {
+
+  },
+
+  /**
+    * 生命周期函数--监听页面显示
+    */
+  onShow: function () {
+  },
 
-    },
 })

+ 5 - 2
package-basic-data/pages/staff/detail/detail.json

@@ -1,3 +1,6 @@
 {
-    "usingComponents": {}
-}
+    "usingComponents": {},
+    "navigationBarTitleText": "邀请员工",
+    "enablePullDownRefresh": true,
+    "backgroundTextStyle": "light"
+  }

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

@@ -1,3 +1,12 @@
-<view>
-	<dk-tree treeList="{{treeList}}" idKey="id" nameKey="name" parentIdKey="pid" itemListKey="nodes" id="treeSelect" bind:clickName="treeClick"></dk-tree>
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<!-- 加载图层 -->
+<loading wx:if="{{loading}}"></loading>
+<!-- 列表区 -->
+<dk-form id="{{formName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
+</dk-form>
+<!--  保存 -->
+<view class="bottom-class">
+  <van-button custom-class="save-button-class" disabled="{{loading}}" loading="{{loading}}" bind:click="save" type="default">保存
+  </van-button>
 </view>

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

@@ -1 +1,20 @@
-/* package-basic-data/pages/staff/detail/detail.wxss */
+/**底部的样式*/
+.bottom-class{
+	position: fixed;
+	bottom: 20rpx;
+	width: 100%;
+	align-items: center;
+	justify-content: center;
+	border-top: 2rpx solid #efefef;
+	z-index: 2;
+	display: flex;
+  }  
+  /**底部保存按钮的样式*/
+  .save-button-class{
+	width: 640rpx;
+	background: #1B365D !important;
+	border-radius: 15rpx !important;
+	color:#fff !important;
+	font-size: 16px !important;
+	font-weight: 500 !important;
+  }

+ 5 - 5
pages/welcome/welcome.js

@@ -131,13 +131,13 @@ Page({
                     })
                 } else {
                     // 调转主页--注意有场景值的情况 
-                    // wx.reLaunch({
-                    //     url: '../../pages/home-page/home-page?scene=' + this.data.scene,
-                    // })
-                    // 调转选择公司
                     wx.reLaunch({
-                        url: '../../pages/login/login',
+                        url: '../../pages/home-page/home-page?scene=' + this.data.scene,
                     })
+                    // // 调转选择公司
+                    // wx.reLaunch({
+                    //     url: '../../pages/login/login',
+                    // })
                 }
             }
             else if (res.data.code === 1015) {