Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

app.json

@@ -5,8 +5,7 @@
         "pages/home-page/home-page",
         "pages/shopping/shopping",
         "pages/mine/mine",
-        "components/dkbase/dk-customer-detail/dk-customer-detail",
-        "components/dkbase/dk-tree/dk-tree"
+        "components/dkbase/dk-customer-detail/dk-customer-detail" 
     ],
     "subPackages": [
         {
@@ -306,7 +305,7 @@
         "dk-popup": "components/dkbase/dk-popup/dk-popup",
         "loading": "components/dkbase/loading/loading",
         "dk-collapse-item": "components/dkbase/dk-collapse-item/dk-collapse-item",
-        "dk-tree": "components/dkbase/dk-tree-form/dk-tree-form"
+        "dk-tree-form": "components/dkbase/dk-tree-form/dk-tree-form"
     },
     "tabBar": {
         "color": "#95A8CB",

components/dkbase/dk-tree-form/dk-tree-form.js

@@ -52,6 +52,7 @@ Component({
             }
             treeList[i].selected = false;
         }
+        debugger
         this.setData({
             tree: treeList
         })

components/dkbase/dk-tree/dk-tree.js

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

components/dkbase/dk-tree/dk-tree.wxml

@@ -1,2 +0,0 @@
-<!--components/dkbase/dk-tree/dk-tree.wxml-->
-<text>components/dkbase/dk-tree/dk-tree.wxml</text>

package-basic-data/pages/org/add/add.wxml

@@ -1 +1 @@
-<dk-tree treeList="{{treeList}}" idKey="id" nameKey="name" parentIdKey="pid" itemListKey="nodes" id="treeSelect" bind:onclick="treeClick"></dk-tree>
+<dk-tree-form treeList="{{treeList}}" idKey="id" nameKey="name" parentIdKey="pid" itemListKey="nodes" id="treeSelect" bind:onclick="treeClick"></dk-tree-form>

package-basic-data/pages/org/org.js

@@ -9,6 +9,7 @@
  *******************************************************************************/
 const Constants = require('@/utils/Constants.js');
 const mixins = require('@/mixins/index.js')
+const util = require('@/utils/util.js')
 const app = getApp()
 Page({
       mixins: [mixins],
@@ -77,5 +78,15 @@ addForm:{},
   getData(params) {
     return this.excute(this.data.service, this.data.service.selectByCond, params);
   },
+ /**
+   * @desc : 查询 后续处理
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+ handleData(data) { 
+  this.setData({
+    tableData: util.convertToChildren(data)
+  })
+},
 
 })

package-basic-data/pages/org/org.wxml

@@ -18,27 +18,8 @@
 <van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}" />
 
 <!-- 列表 -->
-<view  wx:for="{{tableData}}" style="background: white;margin:3vw;border-radius: 15rpx;">
-    <!-- 列表上半部分 -->
-    <view style="display: flex;padding:3vw;background: linear-gradient(to right,#A8D0EF, #DAEFFF);border-radius: 15rpx 15rpx 0 0 ">
-        <view style="display: flex;flex: 1;">
-            <view class="image-frame">
-                <van-image round width="20rpx" height="24rpx" src="/static/img/Vector.png" />
-            </view>
-            <view>{{item.orgName}}</view>
-        </view>
-        <view style=" text-align: right;"><van-icon name="arrow" /></view>
-    </view>
-    <!-- 列表下半部分 -->
-    <view wx:for="{{item.itemData}}" wx:for-item="sub_item" class="list-below-item">
-        <view class="image-frame">
-            <van-image round width="20rpx" height="24rpx" src="/static/img/Vector.png" />
-        </view>
-        <view> {{sub_item.orgName}} </view>
-        <view style="flex:1;text-align: right;"><van-icon name="arrow" /></view>
-    </view>
  
-</view>
+<dk-tree-form treeList="{{tableData}}" idKey="orgId" nameKey="orgName" parentIdKey="parentId" itemListKey="itemData" id="treeSelect" bind:onclick="treeClick"></dk-tree-form>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}</van-divider>
 <view style="height: 135rpx;"></view>