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/dkbase/dk-form/dk-form.js

@@ -8,6 +8,8 @@
  *		周兴		  	2024-1-30    1.00		   	  新建
  *******************************************************************************/
 const common = require('@/utils/common');
+const Constants = require('@/utils/Constants');
+const util = require('@/utils/util.js')
 const chooseLocation = requirePlugin('chooseLocation');
 const app = getApp();
 Component({
@@ -53,6 +55,8 @@ Component({
     dropType: null,
     dropCode: null,
     dropName: null,
+    // 根据值控制组件的显示隐藏
+    changeObj:null,
     form: {}
   },
   lifetimes: {
@@ -113,7 +117,8 @@ Component({
       // 单选
       if (item.item.type == 'drop') {
         this.setData({
-          show: true
+          show: true,
+          changeObj:item.item.changeObj,
         })
         // 多选
       } else if (item.item.type == 'mutidrop') {
@@ -177,7 +182,37 @@ Component({
         form: form,
         contentObj: contentObj
       })
-      console.log('ffff',this.data.form);
+      // 是否根据值进行控制其他组件显示、隐藏
+      let changeObj = this.data.changeObj
+      let key = util.getKeyByValue(Constants.supType,e.detail.value);
+      console.log('ttt3',changeObj,e.detail.value,changeObj[key]);
+      if(changeObj && changeObj[key] ){
+        // 显示
+        if(changeObj[key]['visible']){
+          changeObj[key]['visible'].forEach(it=>{
+            let index = contentObj[card].findIndex(t=>t.code == it)
+            console.log('index',index);
+            if(contentObj[card][index]){
+              contentObj[card][index].hide = false
+            }
+          })
+        }
+        // 隐藏
+        if(changeObj[key]['hide']){
+          changeObj[key]['hide'].forEach(it=>{
+            let index = contentObj[card].findIndex(t=>t.code == it)
+            console.log('index',index);
+            if(contentObj[card][index]){
+              contentObj[card][index].hide = true
+            }
+          })
+        }
+      }
+
+      console.log('ffff',this.data.form,contentObj[card]);
+      this.setData({
+        contentObj:contentObj
+      })
       // 如果处理id，name还需要赋值其他，需要在页面事件中自行处理
       this.triggerEvent("chooseData", { code: this.data.dropCode, list: e.detail.list })
     },

components/dkbase/dk-form/dk-form.wxml

@@ -4,30 +4,30 @@
   <view class="dk-card-class" wx:for="{{cardList}}" wx:for-item="card" data-item="{{card}}">
     <view wx:for="{{contentObj[card]}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
       <!--文本框-->
-      <van-field wx:if="{{item.type=='str'}}" label-class="{{item.required?'red-label':'nomal-label' }}" data-key="{{item.code}}"
+      <van-field wx:if="{{item.type=='str' && !item.hide}}" label-class="{{item.required?'red-label':'nomal-label' }}" data-key="{{item.code}}"
       data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{!!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">
       </van-field>
       <!--单选下拉-->
-      <van-field wx:if="{{item.type=='drop'}}" label-class="{{item.required?'red-label':'nomal-label' }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
+      <van-field wx:if="{{item.type=='drop' && !item.hide}}" label-class="{{item.required?'red-label':'nomal-label' }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
       </van-field>
       <!--多选下拉-->
-      <van-field wx:if="{{item.type=='mutidrop'}}" label-class="{{item.required?'red-label':'nomal-label' }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.name + 's']}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
+      <van-field wx:if="{{item.type=='mutidrop' && !item.hide}}" label-class="{{item.required?'red-label':'nomal-label' }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.name + 's']}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
       </van-field>
       <!--选择框-->
-      <van-field wx:if="{{item.type=='checkbox'}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="left" value="{{ form[item.code] ? '  需要' : '  不需要' }}" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
+      <van-field wx:if="{{item.type=='checkbox' && !item.hide}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="left" value="{{ form[item.code] ? '  需要' : '  不需要' }}" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
         <view slot="inputbefor" style="text-align: left;padding-left: 10rpx;" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" data-value="{{form[item.code]}}" data-key="{{item.code}}" catchtap="changeCheckBox">
           <van-checkbox shape="round" value="{{form[item.code]}}" />
         </view>
       </van-field>
       <!--客户地址-->
-      <van-field wx:if="{{item.type=='address'}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="{{item.required?'red-label':'nomal-label' }}" input-align="left" data-key="address" type="textarea" value="{{ wxmlUtil.addressToIndexOf(form.address.address) }}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" right-icon="location" data-type='address' catchtap="onClickWxchartAddress" readonly="{{true}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" errorMessage="{{item.errMsg}}">
+      <van-field wx:if="{{item.type=='address' && !item.hide}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="{{item.required?'red-label':'nomal-label' }}" input-align="left" data-key="address" type="textarea" value="{{ wxmlUtil.addressToIndexOf(form.address.address) }}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" right-icon="location" data-type='address' catchtap="onClickWxchartAddress" readonly="{{true}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" errorMessage="{{item.errMsg}}">
       </van-field>
       <!--联系电话-->
-      <dk-number-phone-input wx:if="{{item.type=='phone'}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" labelClass="{{item.required?'red-label':'nomal-label' }}" rightIcon="phone" model:value="{{ form[item.code]}}" bind:changeField="changePhone" bind:changeFieldblur="changePhoneblur" errorMessage="{{item.errMsg}}" id="{{item.code}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.code)}}"></dk-number-phone-input>
+      <dk-number-phone-input wx:if="{{item.type=='phone' && !item.hide}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" labelClass="{{item.required?'red-label':'nomal-label' }}" rightIcon="phone" model:value="{{ form[item.code]}}" bind:changeField="changePhone" bind:changeFieldblur="changePhoneblur" errorMessage="{{item.errMsg}}" id="{{item.code}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.code)}}"></dk-number-phone-input>
       <!--数字类-->
-      <dk-number-input wx:if="{{item.type=='number'}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" center="left" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#CAA977" titleFontWeight="{{item.required?'bold':'normal'}}" titleColor="{{item.required?'#E4002B':'#95A8CB'}}" inputValue="{{form[item.code]}}" bind:triggerBindValue="changeNumberField"></dk-number-input>
+      <dk-number-input wx:if="{{item.type=='number' && !item.hide}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" center="left" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#CAA977" titleFontWeight="{{item.required?'bold':'normal'}}" titleColor="{{item.required?'#E4002B':'#95A8CB'}}" inputValue="{{form[item.code]}}" bind:triggerBindValue="changeNumberField"></dk-number-input>
       <!--备注-->
-      <van-field wx:if="{{item.type=='textarea'}}" type="textarea" label-class="{{item.required?'red-label':'nomal-label' }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{!!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">
+      <van-field wx:if="{{item.type=='textarea' && !item.hide}}" type="textarea" label-class="{{item.required?'red-label':'nomal-label' }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{!!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">
       </van-field>
       <!--附件-->
       <view style="display:flex;width:100%;margin: 1vw; padding-top: 20rpx;" wx:if="{{item.type=='uploader'}}">

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'

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

@@ -109,9 +109,9 @@ Component({
           } else {
             this.getdata(DataSourceCode).then(res => {
               let list = res.data.data
-              if (list == null || list.length <= 0){
+              if (list == null || list.length <= 0) {
                 this.setData({
-                  datalist:[]
+                  datalist: []
                 })
                 return;
               }
@@ -119,7 +119,7 @@ Component({
               let datalist = []
 
               // 品牌
-               if (typeName === 'brand') {
+              if (typeName === 'brand') {
                 let nmb = 0
                 let nmb_tenter = 0
                 list.forEach(item2 => {
@@ -128,7 +128,56 @@ Component({
                     code: item2.erpOrgCode,
                     name: item2.name,
                     checked: item2.id == this.properties.contentID ? true : false,
-                   
+
+                  }
+                  nmb_tenter++
+                  if (item2.id == this.properties.contentID) {
+                    nmb = nmb_tenter
+                  }
+                  datalist.push(item)
+                })
+                this.setData({
+                  radio: this.properties.contentID ? (nmb - 1) : ''
+                })
+              }
+              // 供应商类别
+              if (typeName === 'supplierType') {
+
+                let nmb = 0
+                let nmb_tenter = 0
+                list.forEach(item2 => {
+                  let item = {
+                    id: item2.id,
+                    code: item2.code,
+                    name: item2.name,
+                    checked: item2.id == this.properties.contentID ? true : false,
+
+                  }
+                  nmb_tenter++
+                  if (item2.id == this.properties.contentID) {
+                    nmb = nmb_tenter
+                  }
+                  datalist.push(item)
+                })
+                this.setData({
+                  radio: this.properties.contentID ? (nmb - 1) : '',
+                  valueKey: 'code',
+                  labelKey: 'name'
+                })
+              }
+              // 业务部门
+              if (typeName === 'org') {
+                let nmb = 0
+                let nmb_tenter = 0
+                list.forEach(item2 => {
+                  let item = {
+                    id: item2.id,
+                    code: item2.erpOrgCode,
+                    name: item2.name,
+                    checked: item2.id == this.properties.contentID ? true : false,
+                    //部门默认的销售渠道
+                    salesChannel: item2.salesChannel,
+                    salesChannelName: item2.salesChannelName
                   }
                   nmb_tenter++
                   if (item2.id == this.properties.contentID) {
@@ -139,53 +188,7 @@ Component({
                 this.setData({
                   radio: this.properties.contentID ? (nmb - 1) : ''
                 })
-              } 
-                 // 供应商类别
-                 if (typeName === 'supplierType') {
-                  let nmb = 0
-                  let nmb_tenter = 0
-                  list.forEach(item2 => {
-                    let item = {
-                      id: item2.id,
-                      code: item2.erpOrgCode,
-                      name: item2.name,
-                      checked: item2.id == this.properties.contentID ? true : false,
-                     
-                    }
-                    nmb_tenter++
-                    if (item2.id == this.properties.contentID) {
-                      nmb = nmb_tenter
-                    }
-                    datalist.push(item)
-                  })
-                  this.setData({
-                    radio: this.properties.contentID ? (nmb - 1) : ''
-                  })
-                } 
-                // 业务部门
-                if (typeName === 'org') {
-                  let nmb = 0
-                  let nmb_tenter = 0
-                  list.forEach(item2 => {
-                    let item = {
-                      id: item2.id,
-                      code: item2.erpOrgCode,
-                      name: item2.name,
-                      checked: item2.id == this.properties.contentID ? true : false,
-                      //部门默认的销售渠道
-                      salesChannel: item2.salesChannel,
-                      salesChannelName: item2.salesChannelName
-                    }
-                    nmb_tenter++
-                    if (item2.id == this.properties.contentID) {
-                      nmb = nmb_tenter
-                    }
-                    datalist.push(item)
-                  })
-                  this.setData({
-                    radio: this.properties.contentID ? (nmb - 1) : ''
-                  })
-                }
+              }
               // 员工
               else if (typeName === 'staff') {
                 let nmb = 0
@@ -217,7 +220,7 @@ Component({
                 let nmb_tenter = 0
                 list.forEach(item2 => {
                   let item = {
-                    id: item2.id, 
+                    id: item2.id,
                     name: item2.name,
                     code: item2.code,
                     checked: item2.id == this.properties.contentID ? true : false
@@ -231,13 +234,13 @@ Component({
                 this.setData({
                   radio: this.properties.contentID ? (nmb - 1) : ''
                 })
-              } 
+              }
 
               let finallist = [...datalist]
               datalists[this.data.typeName] = [...datalist]
               this.setData({
                 // datalist: datalist,
-                datalists:datalists,
+                datalists: datalists,
                 finallist: finallist
               })
             })
@@ -275,7 +278,7 @@ Component({
     radio: null,
     label_title: '可选',
     count: 0,
-    datalists:{},
+    datalists: {},
     pageInfo: {
       pageSize: 5,
       currentPage: 1
@@ -394,8 +397,8 @@ Component({
       if (typeName === 'estate') {
         DataSourceCode = 'estate'
         name = '小区档案'
-      }  
-       if (typeName === 'brand') {
+      }
+      if (typeName === 'brand') {
         DataSourceCode = 'brand'
         name = '品牌'
       }
@@ -433,7 +436,7 @@ Component({
         if (DataSourceCode === 'warehouse') {
           param.orgId = this.data.orgId ? this.data.orgId : app.globalData.user.orgId
         }
-        if (DataSourceCode === 'org' || DataSourceCode === 'staff'|| DataSourceCode === 'brand') {
+        if (DataSourceCode === 'org' || DataSourceCode === 'staff' || DataSourceCode === 'brand') {
           param.docName = this.data.docName
           param.cpId = 1
           param.sysId = 2
@@ -494,6 +497,7 @@ Component({
           // datalist: datalist,
           show: false
         })
+        console.log('ttt34', item, this.data.valueKey);
         this.triggerEvent('commit', {
           value: item[this.data.valueKey],
           text: item[this.data.labelKey],
@@ -558,7 +562,7 @@ Component({
       this.setData({
         finallist: finallist,
         // datalist: datalist,
-        datalists:datalists,
+        datalists: datalists,
         condition: '',
         radio: '',
 
@@ -604,13 +608,13 @@ Component({
       // 清空控件
       this.setData({
         // datalist: datalist,
-        datalists:datalists,
+        datalists: datalists,
         finallist: finallist,
         condition: '',
         isClickClear: true,
         dataValue: '',
         count: 0,
-        radio:null,
+        radio: null,
         label_title: '可选',
         defaultCheackFlag: true
       })
@@ -655,7 +659,7 @@ Component({
       let finallist = [...datalist]
       this.setData({
         // datalist: datalist,
-        datalists:datalists,
+        datalists: datalists,
         finallist: finallist
       })
     }

components/dkbusiness/dk-single-dropdown-item/dk-single-dropdown-item.wxml

@@ -10,9 +10,8 @@
   <view class="root" style="height:calc(100% - 120rpx)">
     <view class="scroll_search" style="overflow-x:hidden;">
       <scroll-view class="scroll_position" scroll-x="{{false}}" scroll-y enable-back-to-top>
-
         <van-radio-group value="{{ radio }}" bind:change="onChange">
-          <van-radio wx:for="{{datalists[typeName]}}" shape="round" icon-size="16px"  data-index="{{index}}" data-id="{{item.id}}" name="{{index}}" custom-class="custom-class" checked-color="#1B365D" label-class="{{radio==index?'label-checked-class':'label-class'}}">{{item.name}}
+          <van-radio wx:for="{{datalists[typeName]}}" shape="round" icon-size="16px"  data-index="{{index}}" data-id="{{item.id}}" name="{{index}}" custom-class="custom-class" checked-color="#1B365D" label-class="{{(radio != nul && radio==index)?'label-checked-class':'label-class'}}">{{item.name}}
           </van-radio>
         </van-radio-group>
 

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) {

utils/Constants.js

@@ -136,6 +136,12 @@ module.exports = {
     all:'收款完成'
   },
 
+  // 供应商类别
+  supType:{
+    pur:'供应商类别-采购',
+    service:'供应商类别-服务'
+  },
+
   // 收款进度
   receiveStatusList: [{ name: '未收款',code:'收款状态-未收', id: 0, infotype: 'default' },
   { name: '部分收款',code:'收款状态-部分', id: 1, infotype: 'default' },

utils/util.js

@@ -719,8 +719,23 @@ function _convertToChildren(item, arr, idValue, pId, id, path = null) {
   }
 }
 
+/**
+ * @desc   : 根据枚举值获取相应的键名
+ * @author : 周兴
+ * @date   : 2024/2/29 17:06
+ */
+function getKeyByValue(enumObj, value) {
+  for (let key in enumObj) {
+      if (enumObj[key] === value) {
+          return key;
+      }
+  }
+  return null;
+}
+
 
 module.exports = {
+  getKeyByValue:getKeyByValue,
   convertToChildren:convertToChildren,
   objectMergeByMainJs: objectMergeByMainJs,
   updateProvince: updateProvince,