wangyingjie 2 年之前
父節點
當前提交
f43b409ff2

+ 4 - 4
api/pages/mst/org.js

@@ -8,18 +8,18 @@
  *		王英杰		  	     2024-1-19       			1.00		       	新建
  *******************************************************************************/
 module.exports = {
-    staffService: {
+    orgService: {
         // 前缀
-        prefix: 'mdm-server-dkic-b1/core/org/', 
+        prefix: 'mdm-server-dkic-b1/org/', 
         
     },
-
+  
     routeUrl: {
         org: {
             // 用name代替url,为了传递params,params和url不能一起使用
             // add: {key: 'add', url: '/pages/index/index2'},
           // 客户跟进
-          follow: { key: 'follow', url: '/package3/pages/customer-follow-up/add/add', image: '/static/img/customerFollow.png', valid: true },
+          chooseOrg: { key: 'chooseOrg', url: '/package-basic-data/pages/org/choose-org/choose-org'  },
           // 跟进任务
           followTask: { key: 'followTask', url: '/package3/pages/follow-up-tasks/follow-up-tasks', image: '/static/img/followTask.png' },
           // 销售订单

+ 1 - 1
package-basic-data/pages/org/choose-org/choose-org.js

@@ -5,7 +5,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-
+        list:[{},{}]
     },
 
     /**

+ 47 - 2
package-basic-data/pages/org/choose-org/choose-org.wxml

@@ -1,2 +1,47 @@
-<!--package-basic-data/pages/org/choose-org/choose-org.wxml-->
-<text>package-basic-data/pages/org/choose-org/choose-org.wxml</text>
+<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<van-sticky scroll-top="0">
+  <van-search model:value="{{ searchText }}" placeholder="请输入客户名称/地址/电话" use-action-slot bind:search="doSearch">
+  </van-search></van-sticky>
+
+  <view wx:for="{{list}}" data-item="{{item}}" wx:for-index="childindex" wx:key="index" class="main-class">
+  <view class="main-foot">
+    <view class="table">
+      <view data-index="{{index}}" data-item="{{item}}" catchtap="catchtapCheck">
+        <view class="table-row-right">
+          <view>
+            <dk-text fontSize="13px" fontWeight="nomal" value="{{item.customerName ? item.customerName :''}}"></dk-text>
+          </view>
+          <view style="font-size: 27rpx;  text-align: right;display: flex;">
+            <view style="padding-right: 15rpx;padding-top:5rpx;">
+              <van-icon name="phone" />
+            </view>
+            <view>
+              <dk-text fontSize="13px" fontWeight="nomal" value="{{item.customerPhone ? item.customerPhone :''}}"></dk-text>
+            </view>
+
+          </view>
+        </view>
+        <view style="width: 100%; display:flex;">
+          <view style="width:10%; margin-top:5px">
+            <van-checkbox value="{{item.checked}}" data-index="{{index}}" data-item="{{item}}" catchtap="catchtapCheck" checked-color="#1989FA" />
+          </view>
+          <view style="width:87%;">
+            <van-divider />
+          </view>
+        </view>
+
+        <view class="table-row-right">
+          <view style="display: flex;">
+            <van-icon name="location" color="#1B365D" />
+            <dk-text fontSize="13px" fontWeight="nomal" value="{{ wxmlUtil.addressToIndexOf(item.addressFull ? item.addressFull :'')}}"></dk-text>
+          </view>
+
+        </view>
+      </view>
+    </view>
+
+  </view>
+</view>
+<view style="height: 250rpx;"></view>
+<van-empty wx:if="{{list.length<=0}}" description="暂无数据" />

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

@@ -41,4 +41,20 @@ Page({
     addSave(){
 
     },
+     /**
+     * 打开选择客户
+     */
+    openChooseOrg(){
+        wx.navigateTo({
+            url: this.data.route.chooseOrg.url,
+            events: function (e) {
+              // 回调后,在这里给页面赋值
+      
+            },
+            success: function (res) {
+              // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的,实际中,需要从route中读取
+              res.eventChannel.emit('params', {})
+            }
+          })
+    },
 })

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

@@ -85,7 +85,7 @@
   <van-field disabled="{{false}}" disabled="{{true}}" input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" maxlength="50" value="{{'PP00001'}}" input-align="right" label="部门编码" placeholder="{{'请输入' + '品牌编码'}}" autosize border="{{ false }}">
   </van-field>
  
-  <van-field label-class="nomal-label" input-width="200rpx" input-class="dk-cell-value-class" input-align="right" data-key="supplier-list" maxlength="25" type="text" value="{{'' }}" label="上级部门" placeholder="请选择" autosize border="{{ false }}" right-icon="arrow" color="#95A8CB" catchtap="openSingle" readonly="{{true}}">
+  <van-field label-class="nomal-label" input-width="200rpx" input-class="dk-cell-value-class" input-align="right" data-key="supplier-list" maxlength="25" type="text" value="{{'' }}" label="上级部门" placeholder="请选择" autosize border="{{ false }}" right-icon="arrow" color="#95A8CB" catchtap="openChooseOrg" readonly="{{true}}">
   </van-field>
   <van-field disabled="{{false}}" disabled="{{true}}" input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" maxlength="50" value="{{'PP00001'}}" input-align="right" label="部门名称" placeholder="{{'请输入' + '品牌编码'}}" autosize border="{{ false }}">
   </van-field>