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

api/pages/mst/basicData.js

@@ -19,7 +19,8 @@ module.exports = {
     basicData: {
       sort:{
         key:'sort',url:'/package-basic-data/pages/basic-data/basic-data-sort/basic-data-sort'
-      }
+      },
+      chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  }, 
     }
   }
 };

api/pages/mst/customer.js

@@ -37,6 +37,7 @@ module.exports = {
 
       chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },
       chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-data/select-data',type:'org' }, 
+      collection:{ key: 'collection', url: '/package-sales/pages/customer-collection/customer-collection', formMode: 'index', idKey: 'cusId' } //跳转客户收款
     }
   }
 };

api/pages/mst/warehouse.js

@@ -15,7 +15,7 @@ module.exports = {
   },
   routeUrl: {
     warehouse: {
-    
+      chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff' , choosePopupType: 'supervisor', },
     }
   }
 };

api/pages/sale/order.js

@@ -35,6 +35,7 @@ module.exports = {
       selectCollectionConfirm: { key: 'selectCollectionConfirm', url: '/package-base-select/pages/select-collection_confirm/select-collection_confirm' },
       chooseChannel: { key: 'chooseChannel', url: '/package-base-select/pages/select-data/select-data', type: 'saleChannel' },
       choosecusFrom: { key: 'choosecusFrom', url: '/package-base-select/pages/select-data/select-data', type: 'customerFrom' },
+      collection:{ key: 'collection', url: '/package-sales/pages/customer-collection/customer-collection', formMode: 'index', idKey: 'cusId' } //跳转客户收款
     }
 
   }

components/dkbase/dk-list/dk-list.js

@@ -41,6 +41,10 @@ Component({
       type: Boolean,
       value: true
     },
+    flgValidOnFlag:{ //默认显示启用
+      type: Boolean,
+      value: true
+    },
     // 副标题
     subTitle: {
       type: String,

components/dkbase/dk-list/dk-list.wxml

@@ -1,6 +1,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <view wx:for="{{list}}" data-item="{{item}}" wx:key="index" class="main-class">
-  <van-swipe-cell right-width="{{ 65 }}" disabled="{{swipeDisabled}}" data-index="{{index}}" data-item="{{item}}" bind:click="onCloseSwipe">
+<!-- 默认无法停用 -->
+  <van-swipe-cell right-width="{{ 65 }}" disabled="{{swipeDisabled || (defaultFlag &&  item[defaultFlagKey])}}" data-index="{{index}}" data-item="{{item}}" bind:click="onCloseSwipe">
     <view class="main-foot" style="position: relative;">
       <view class="corner-view" wx:if="{{item[titleCorner]}}">
         <view class="corner-view-text">{{item[titleCorner]}}</view>
@@ -39,7 +40,10 @@
             </view>
             <!-- 启用/停用标识-->
             <view wx:if="{{switchFlag}}" style="text-align: right;">
-              <view class="status-detail-class" style="{{item['flgValid'] ? 'width: 56rpx' : 'background-color:red;width: 56rpx;'}}">{{item['flgValid'] ? $t['enable'] : $t['disable']}}
+              <view wx:if="{{flgValidOnFlag}}" class="status-detail-class" style="{{item['flgValid'] ? 'width: 56rpx' : 'background-color:red;width: 56rpx;'}}">{{item['flgValid'] ? $t['enable'] : $t['disable']}}
+              </view>
+
+              <view wx:if="{{!flgValidOnFlag && !item['flgValid']}}" class="status-detail-class" style="background-color:red;width: 56rpx;">{{ $t['disable']}}
               </view>
             </view>
             <!-- 三个小点 -->

components/dkbase/dk-popup/dk-popup.js

@@ -227,6 +227,11 @@ Component({
                     form['usableQty'] = data.data.item.usableQty 
                     form['invQty'] = data.data.item.invQty 
                   }
+                  if(item.item.name == 'supervisor'){  //仓库主管
+                    console.log(data)
+                    form['contactPhone'] = data.data.staffPhone 
+                  }
+                  
                   that.setData({
                     form: form,
                   })

package-base-select/pages/select-data/select-data.js

@@ -155,6 +155,7 @@ Page({
           name: item.staffName,
           orgId: item.orgId,
           orgName: item.orgName,
+          staffPhone: item.staffPhone,
         }
         break;
 

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

@@ -25,7 +25,7 @@ Page({
     commonService: app.globalData['commonService'],
     routeObjName: 'basicData',
     tableData: [],
-    buttonSaveList: [{ code: 'sort', title: '排序', width: '120rpx', plain:true}, { code: 'add', title: '新建', width: '120rpx', color: '#CAA977' }],
+    buttonSaveList: [{ code: 'sort', title: '排序', width: '120rpx', plain: true }, { code: 'add', title: '新建', width: '120rpx', color: '#CAA977' }],
     contentSaveList: [],
     // 查询条件
     searchContent: [{
@@ -88,7 +88,13 @@ Page({
         [
           { code: 'whCode', type: 'str', title: mixins.$t('whCode'), required: false, readonly: true, },
           { code: 'whName', type: 'str', title: mixins.$t('whName'), required: true },
-          { code: 'supervisor', type: 'str', title: mixins.$t('supervisor'), required: true },
+          {
+            name: 'supervisor',
+            title: mixins.$t("supervisor"),
+            type: 'choose',
+            required: true,
+            urlKey: 'chooseStaff'
+          },
           { code: 'contactPhone', type: 'str', title: mixins.$t('contactPhone'), required: true },
           { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
         ]
@@ -150,6 +156,10 @@ Page({
             { code: 'dataValue', type: 'str', title: mixins.$t('sourceName'), required: true },
           ]
       }
+      if (formDataName == '客户标签') {
+        //设置新建编辑字段 客户来源
+        popContent =[]
+      }
       popContent.push({ code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false })
     }
 
@@ -237,7 +247,8 @@ Page({
       formData: null,
       showPop: true,
     })
-
+    //清除组件数据
+    this.selectComponent('#popup').setFormNull()
   },
   /**
   * @desc : 跳转排序
@@ -356,9 +367,11 @@ Page({
         service = this.data.saleChannelService
         id = params.channelId
       } else { //基础数据
+        console.log(params)
         service = this.data.service
-        id = params.data_id
+        id = params.dataId
         params.dictCode = this.data.dictCode
+        
       }
     if (id) { //编辑
       return this.excute(service, service.update, params);

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

@@ -15,7 +15,7 @@
   </van-sidebar>
   <view style="margin-left: 140rpx;width: 100%;">
   <!-- 列表 -->
-    <dk-list list="{{tableData}}" titleImageFlag="{{false}}" swipeDisabled="{{false}}" bind:swipe="deactivateEnable" statusFlag="{{false}}" flgPoint="{{false}}" switchFlag="{{true}}" title="listItemTitle" content="{{contentList}}" collectName=""  contentObj="{{contentObj}}" contentCol="listItemTitle"  bind:toDetail="toDetail" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" 
+    <dk-list list="{{tableData}}" titleImageFlag="{{false}}" swipeDisabled="{{false}}" bind:swipe="deactivateEnable" statusFlag="{{false}}" flgPoint="{{false}}" switchFlag="{{true}}" title="listItemTitle" content="{{contentList}}" collectName="" flgValidOnFlag="{{false}}"  contentObj="{{contentObj}}" contentCol="listItemTitle"  bind:toDetail="toDetail" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" 
     defaultFlag="{{true}}" defaultFlagKey="flgDefault"
     bind:open="open"></dk-list>
 
@@ -27,7 +27,7 @@
 </view>
 
 
-<dk-popup defaultFlagCol="flgDefault" defaultFlagTitle="默认" type="basic" priceTitle="" priceCol="pricePromotion" subCol="desc" title="{{formDataName}}" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjNameGoTo}}" contentObj="{{popContent}}" bind:commit="editItems">
+<dk-popup id="popup"  validFlag="{{true}}"  defaultFlagCol="flgDefault" defaultFlagTitle="默认" type="basic" priceTitle="" priceCol="pricePromotion" subCol="desc" title="{{formDataName}}" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjNameGoTo}}" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>
 
 

package-basic-data/pages/customer-list/customer-list.js

@@ -57,7 +57,7 @@ Page({
     buttonList: [
       { name: 'followUp', title:mixins.$t('followUp') },
       { name: 'followUpTasks', title:mixins.$t('followUpTasks') },
-      { name: 'customerRefundList', title: mixins.$t('cusCollection')}
+      { name: 'collection', title: mixins.$t("cusCollection")  ,idKey: 'cusId' },//跳转客户收款
     ],
 
     totallength: 0, //视图下方提醒数量

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

@@ -16,7 +16,7 @@ Page({
       { name: 'copyAdd', title: mixins.$t('copyAndAdd'),formMode: Constants.formMode.edit,formType: Constants.formMode.add, idKey: 'roleId', }, 
       { name: 'selectSensitiveData', title: mixins.$t('sensitiveData'),formType: Constants.formMode.add }
     ],
-    buttonSaveList:[{code:'add',title:'新建角色',width:'120rpx',color:'#1B365D'}],
+    buttonSaveList:[{code:'add',title: mixins.$t('roleAdd'),width:'120rpx',color:'#1B365D'}],
     contentSaveList:[],
       // 查询条件
       searchContent: [{

package-inventory/pages/inventory-freeze/add/add.js

@@ -184,7 +184,7 @@ Page({
         },
         success: function (res) {
           res.eventChannel.emit('params', {
-            formMode: 'detailEdit', id: this_.data.id
+            formMode: Constants.formMode.detailEdit, id: this_.data.id
           });
         }
       })

package-sales/pages/customer-collection/customer-collection.js

@@ -97,7 +97,15 @@ Page({
     ],
   },
 
-
+/**
+   * @desc : 设置查询参数
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  setSearchParams(params) {
+    params.objectId = this.data.id ?  this.data.id : null
+    return params;
+  },
   /**
    * @desc : 加载数据
    * @author : 于继渤

package-sales/pages/order-billing/order-billing.js

@@ -22,9 +22,7 @@ Page({
     searchContent: [
       { code: 'createtime', title: mixins.$t("pastThirthtyDays"), defaultValue: 5, searchType: Constants.searchType.date },
       { code: 'staff', title: mixins.$t("staffId"), dropType: 'staff' },
-      {
-        code: 'orderStatus', title: '审批状态', searchType: Constants.searchType.switch
-      },
+      { code: 'org', title: mixins.$t("orgId"), dropType: 'org' },
       {
         code: 'choose', title: mixins.$t("choose"), searchType: Constants.searchType.pick
       }
@@ -95,7 +93,7 @@ Page({
           idKey: 'orderId'
         }
       },//退货
-      { name: 'collection', title: mixins.$t("cusCollection") },//收款
+      { name: 'collection', title: mixins.$t("cusCollection")  ,idKey: 'cusId' },//跳转客户收款
       { name: 'merge', title: mixins.$t("printedBill") }, //打印
       { name: 'invalid', title: mixins.$t("invaidOrder") } //作废
     ],

package-sales/pages/order-billing/order-billing.wxml

@@ -7,7 +7,7 @@
 
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress','contractNumber'])}}">
   </dk-dropdown-menu>
-  <dk-tabs active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs"></dk-tabs>
+  <dk-tabs active="{{active}}"  list="{{tagList}}" bind:onChange="onChangeTabs"></dk-tabs>
 </van-sticky>
 
 

package-sales/pages/sales-outbound/sales-outbound.js

@@ -16,7 +16,7 @@ Page({
    * 页面的初始数据 
    */
   data: {
-    tagList: [{ title: "全部",code:'' }, { title: "待出库" ,code:'出库状态-待出库'}, { title: "已出库" ,code:'出库状态-已出库'}],
+    tagList: [{ title: "全部", code: '' }, { title: "待出库", code: '出库状态-待出库' }, { title: "已出库", code: '出库状态-已出库' }],
     // 列表区（脚部金额）
     footerAmount: { name: 'outAmt', title: mixins.$t("totalAmount") },
     // 列表区（脚部信息）
@@ -28,6 +28,13 @@ Page({
       { name: 'addressFull', title: mixins.$t("adddressFull") },
       { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: mixins.$t("staffId") }], title: mixins.$t("storeInformation") }
     ],
+    // 查询条件
+    searchContent: [
+      { code: 'createtime', title: mixins.$t("pastThirthtyDays"), defaultValue: 5, searchType: Constants.searchType.date },
+      { code: 'staff', title: mixins.$t("staffId"), dropType: 'staff' },
+      { code: 'org', title: mixins.$t("orgId"), dropType: 'org' },
+      { code: 'choose', title: mixins.$t("choose"), searchType: Constants.searchType.pick }
+    ],
     contentObj: {
       '待出库': [
         { name: 'outNo', title: mixins.$t("outOrderNo") },