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

api/pages/mst/Unit.js

@@ -10,8 +10,8 @@
 module.exports = {
   unitService: {
     // 前缀
-    // prefix: 'mdm-server-dkic-b1/mst/unit/',
-    prefix: 'mdm-server/mst/unit/'
+    prefix: 'mdm-server-dkic-b1/mst/unit/',
+    // prefix: 'mdm-server/mst/unit/'
   },
   routeUrl: {
     Unit: {

api/pages/mst/goodsBrand.js

@@ -10,8 +10,8 @@
 module.exports = {
   goodsBrandService: {
     // 前缀
-    // prefix: 'mdm-server-dkic-b1/mst/goodsBrand/',
-    prefix: 'mdm-server/mst/goodsBrand/'
+    prefix: 'mdm-server-dkic-b1/mst/goodsBrand/',
+    // prefix: 'mdm-server/mst/goodsBrand/'
   },
   routeUrl: {
     goodsBrand: {

api/pages/mst/goodsSeries.js

@@ -10,8 +10,8 @@
 module.exports = {
   goodsSeriesService: {
     // 前缀
-    // prefix: 'mdm-server-dkic-b1/mst/goodsSeries/',
-    prefix: 'mdm-server/mst/goodsSeries/'
+    prefix: 'mdm-server-dkic-b1/mst/goodsSeries/',
+    // prefix: 'mdm-server/mst/goodsSeries/'
   },
   routeUrl: {
     goodsSeries: {

components/dkbusiness/dk-muti-dropdown-item/dk-muti-dropdown-item.js

@@ -96,8 +96,23 @@ Component({
                 }
                 datalist.push(item)
               })
-              //渠道
-            } else if (typeName === 'salesChannel') {
+             
+            }
+            // 角色
+            else if (typeName === 'role') {
+              list.forEach(item2 => {
+                let item = {
+                  id: item2.id,
+                  name: item2.name,
+                  qvUserid: item2.qvUserid,
+                  checked: false
+                }
+                datalist.push(item)
+              })
+             
+            }
+            else if (typeName === 'salesChannel') {
+               //渠道
               list.forEach(item2 => {
                 let item = {
                   id: item2.id,
@@ -279,6 +294,11 @@ Component({
         DataSourceCode = 'staff'
         name = '业务员'
       }
+       //角色
+       if (typeName === 'role') {
+        DataSourceCode = 'role'
+        name = '角色'
+      }
       //销售渠道
       if (typeName === 'salesChannel') {
         DataSourceCode = 'salesChannel'

i18n/zh-CN.js

@@ -69,8 +69,7 @@ const columns = {
   followCount:'跟进次数',
   nextFollowTime:'跟进提醒',
   follow:'客户跟进',
-  customerName:'客户名称',
-  staffName:'业务员',
+  customerName:'客户名称', 
   address:'地址',
   customTags:'标签',
   telephone:'电话',

mixins/index.js

@@ -297,21 +297,20 @@ module.exports = {
    * @date : 2024/1/19
    */
   _setParams() {
-    let params = this.data.params;
-    params = {}
+    let params = {} 
     if (this.data.formData) {
       params = JSON.parse(this.data.formData);
     }
     params.cpId = 1
     this.setData({
       params: params
-    })
-    // console.log('tttt',params);
+    }) 
+    console.log('tttt',params,this.data.formData);
     if (this.setParams) {
       // 调用参数赋值
-      let params = this.setParams(params);
+      let parm = this.setParams(params);
       this.setData({
-        params: params
+        params: parm
       })
     }
   },

package-base-select/pages/select-staff-purview/select-staff-purview.js

@@ -33,7 +33,6 @@ Page({
         }
       })
     }
-
     this.setData({
       tableData: tableData
     })
@@ -46,10 +45,8 @@ Page({
   */
   setParams(params) {
     // 修改之后的 值
-    params = Object.assign({}, params, this.data.initData);
-    params.roleIds = (params.roleIds && params.roleIds.length > 0) ? params.roleIds.join(',') : undefined
-    let tableData = this.data.tableData
-    console.log("tableData", tableData);
+    params = Object.assign({}, params, this.data.item);
+    let tableData = this.data.tableData 
     let dataIds = []
     //格式化数据
     let tableDataTemp = []
@@ -68,11 +65,12 @@ Page({
     let staffPurviewList = []
     let staffPurviewO = {
       purviewCode: 'PU10000001',
-      staffId: this.data.initData.staffId,
+      staffId: this.data.item.staffId,
       flgNolimit: false,
-      dataIds: dataIds.join(',')
+      dataIds: dataIds
     }
-    params.staffPurviewList = staffPurviewList.push(staffPurviewO)
+    staffPurviewList.push(staffPurviewO) 
+    params.staffPurviewList = staffPurviewList 
     return params
   },
 
@@ -83,8 +81,7 @@ Page({
  */
   validData() {
     let params = this.data.formData
-    // 修改之后的 值
-    console.log('validData', params)
+    // 修改之后的 值 
     return true;
   },
 
@@ -93,39 +90,45 @@ Page({
   * @date : 2024/2/1 15:49
   * @author : 姜永辉
   */
-  saveData(params) {
-    console.log("saveData", params);
+  saveData(params) { 
     return this.excute(this.data.service, this.data.service.saveStaffPurview, params)
   },
 
   /**
-   * @desc : 处理接口返回数据
+   * @desc : 处理查询接口返回数据
    * @date : 2024/2/1 15:49
    * @author : 姜永辉
    */
-  handleData(tableData) {
-    console.log("handleData", tableData);
+  handleSearchData(tableData) {    
     let allchecked = true
     tableData.forEach(it => {
-      if (!it.checked) {
-        allchecked = false
-        return
-      }
-    })
+      it.menuName = it.orgName 
+    }) 
     this.setData({
       tableData: util.convertToChildren(tableData),
       allchecked,
     })
   },
 
+   /**
+   * @desc   : 处理数据-保存的逻辑
+   * @author : 姜永辉
+   * @date   : 2024/1/26 11:46
+   */
+  handleData() {  
+    wx.navigateBack({
+      data: 1
+    })
+  },
+
   /**
    * @desc : 设置额外参数
    * @date : 2024/2/1 15:49
    * @author : 姜永辉
    */
   setSearchParams(params) {
-    params.staffId = this.data.initData.staffId
-    params.cpId = this.data.initData.cpId
+    params.staffId = this.data.item.staffId
+    params.cpId = this.data.item.cpId
     return params
   },
   /**
@@ -141,8 +144,7 @@ Page({
     * @date : 2024/2/1 15:49
     * @author : 姜永辉
     */
-  obtainList(e) {
-    console.log("obtainList", e);
+  obtainList(e) { 
     this.setData({
       tableData: e.detail.list
     })
@@ -169,15 +171,7 @@ Page({
           windowWidth: res.windowWidth
         })
       }
-    })
-    //接收父页面传递的参数
-    let that = this
-    const eventChannel = this.getOpenerEventChannel()
-    eventChannel.on('data', function (data) {
-      that.setData({
-        initData: data
-      })
-    })
+    })   
   },
 
   /**
@@ -197,8 +191,7 @@ Page({
     }
     api.request(Constants.BASIC_COMMON_API + 'get_wx_init_data', 'POST', param)
       .then(res => {
-        if (res.data.code === Constants.SUCESS_CODE) {
-          console.log(res);
+        if (res.data.code === Constants.SUCESS_CODE) { 
           let list = res.data.data
           let typeList = this.data.typeList || []
           list.forEach(item2 => {

package-base-select/pages/select-staff-purview/select-staff-purview.wxml

@@ -1,6 +1,6 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
-<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<loading wx:if="{{loading}}"></loading>
 <van-sticky scroll-top="0">
   <!-- 查询条件 -->
   <dk-dropdown-menu model:searchForm="{{searchForm}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['roleFunName'])}}">
@@ -10,10 +10,10 @@
       <view style="width: 18%;">
         <van-image width="40rpx" height="40rpx" src="{{'/static/img/roles.png'}}" />
       </view>
-      <view class="font" style="width: 82%;">{{initData.orgName}}</view>
+      <view class="font" style="width: 82%;">{{item.orgName}}</view>
     </view>
     <view style="width: 50%;text-align: right;">
-      {{initData.staffName}}
+      {{item.staffName}}
     </view>
   </view>
 
@@ -23,7 +23,7 @@
 <view class="main-good-class" style="height:{{windowHeight+'px'}}">
   <scroll-view scroll-y='{{true}}' bindscrolltolower='scrollToLower' lower-threshold='100' class="goods-class" style="height:calc({{windowHeight+'px'}} - 295rpx);overflow: scroll;">
     <van-cell-group style="display: flex;justify-content: flex-end;width: calc({{windowWidth+'px'}} - 40rpx);" custom-class="width-70">
-      <dk-collapse-item list="{{tableData}}" bind:obtainList="obtainList"></dk-collapse-item>
+      <dk-collapse-item list="{{tableData}}"  bind:obtainList="obtainList"></dk-collapse-item>
     </van-cell-group>
   </scroll-view>
 

package-base-select/pages/select-staff-right/select-staff-right.js

@@ -80,8 +80,7 @@ Page({
  */
   validData() {
     let params = this.data.formData
-    // 修改之后的 值
-    console.log('validData', params)
+    // 修改之后的 值 
     return true;
   },
 
@@ -90,8 +89,7 @@ Page({
   * @date : 2024/2/1 15:49
   * @author : 姜永辉
   */
-  saveData(params) {
-    console.log("saveData", params);
+  saveData(params) { 
     return this.excute(this.data.service, this.data.service.saveStaffRight, params)
   },
 
@@ -100,8 +98,7 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 姜永辉
    */
-  handleData(tableData) {
-    console.log("handleData", tableData);
+  handleSearchData(tableData) { 
     let allchecked = true
     tableData.forEach(it => {
       if (!it.checked) {
@@ -120,8 +117,7 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 姜永辉
    */
-  setSearchParams(params) {
-    console.log("setSearchParams", params);
+  setSearchParams(params) { 
     params.staffId = this.data.item.staffId
     return params
   },
@@ -138,8 +134,7 @@ Page({
     * @date : 2024/2/1 15:49
     * @author : 姜永辉
     */
-  obtainList(e) {
-    console.log("obtainList", e);
+  obtainList(e) { 
     this.setData({
       tableData: e.detail.list
     })
@@ -151,16 +146,7 @@ Page({
   * @author : 姜永辉
   */
   loadInit() {
-    //接收父页面传递的参数
-    let that = this
-    console.log("loadInit", this.data.item);
-    // const eventChannel = this.getOpenerEventChannel()
-    // eventChannel.on('params', function (data) {
-    //   console.log("loadInit", data);
-    //   that.setData({
-    //     initData: data
-    //   })
-    // })
+    //接收父页面传递的参数 
   },
 
   /**

package-base-select/pages/select-staff-right/select-staff-right.wxml

@@ -10,7 +10,7 @@
       <view style="width: 18%;">
         <van-image width="40rpx" height="40rpx" src="{{'/static/img/roles.png'}}" />
       </view>
-      <view class="font" style="width: 82%;">{{item.roleNames}}</view>
+      <view class="font" style="width: 82%;">{{item.orgName}}</view>
     </view>
     <view style=" text-align: right;">
       <view style="display: flex;">

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

@@ -45,15 +45,6 @@ Page({
    * @date   : 2024/1/26 11:46
    */
   handleData() {
-    this.setData({
-      formData: null
-    })
-
-    // 接收父页面传递的参数
-    const eventChannel = this.getOpenerEventChannel()
-    let _this = this;
-    eventChannel.emit('bandData', {})
-
     wx.navigateBack({
       data: 1
     })
@@ -73,6 +64,17 @@ Page({
   },
 
   /**
+  * @desc : 保存的參數設置
+  * @date : 2024/2/1 15:49
+  * @author : 姜永辉
+  */
+  setParams(params) {
+    console.log("setParams",params);
+    params.roleIds = (params.roleIds && params.roleIds.length > 0) ? params.roleIds.split(',') : []
+    return params
+  },
+
+  /**
   * @desc : 保存数据服务
   * @date : 2024/2/1 15:49
   * @author : 姜永辉
@@ -95,7 +97,7 @@ Page({
     data.roleIds = (data.roleIds && data.roleIds.length > 0) ? data.roleIds.join(',') : undefined
     this.setData({
       formData: JSON.stringify(data)
-    }) 
+    })
 
   },
 
@@ -105,6 +107,7 @@ Page({
    * @author : 姜永辉
    */
   loadInit() {
+    console.log("loadInit");
     if (this.data.formMode == Constants.formMode.edit) {
       wx.setNavigationBarTitle({
         title: mixins.$t('staffEdit'),

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

@@ -61,7 +61,7 @@ Page({
   toDetail(e) {
     let staffId = e.detail.item.staffId
     wx.navigateTo({
-      url: './detail/detail',//' this.data.route.add.url,
+      url: this.data.route.add.url,
       events: {
         // 回调后，在这里给页面赋值
         bandData: function (e) {