日记账筛选改多选

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

@@ -98,7 +98,6 @@ Component({
                 }
                 datalist.push(item)
               })
-
             }
             // 角色
             else if (typeName === 'role') {
@@ -143,6 +142,22 @@ Component({
                 }
                 datalist.push(item)
               })
+            }else if (typeName === 'settlement'){
+                let nmb = 0
+                let nmb_tenter = 0
+                list.forEach(item2 => {
+                  let item = {
+                    id: item2.id,
+                    code: item2.macCode,
+                    name: item2.macName,
+                    checked: item2.id == this.properties.contentID ? true : false
+                  }
+                  nmb_tenter++
+                  if (item2.id == this.properties.contentID) {
+                    nmb = nmb_tenter
+                  }
+                  datalist.push(item)
+                })
             }
             else if (typeName === 'brand') {
               list.forEach(item2 => {
@@ -271,6 +286,11 @@ Component({
         DataSourceCode = 'recType'
         name = '收支类型'
       }
+      //结算方式
+      if (typeName === 'settlement') {
+        DataSourceCode = 'settlement'
+        name = '结算方式'
+      }
       this.setData({
         DataSourceCode: DataSourceCode
       })
@@ -365,6 +385,11 @@ Component({
         name = '库存'
       }
 
+      //结算方式
+      if (typeName === 'settlement') {
+        DataSourceCode = 'settlement'
+        name = '结算方式'
+      }
       this.setData({
         DataSourceCode: DataSourceCode
       })

i18n/zh-CN.js

@@ -100,7 +100,7 @@ const mac = {
   returnAdvancePrepaidAmount: '退预付金额',
   returnAmount: '退款',
   biznisNo: '业务单号',
-  settlement: '结算方式',
+  settlement: '资金账户',
   actualTotalAmount: '合计金额',
   wholeOrderDiscount: '整单折扣',
   goodswholeOrderDiscount: '商品折扣',

package-accounts-manage/pages/daily-reconciliation-statement/daily-reconciliation-statement.js

@@ -18,10 +18,16 @@ Page({
     // 查询条件
     searchContent: [
       {
-        code: 'accDate', title: mixins.$t('pastThirthtyDays'),
-        defaultValue: 5, searchType: Constants.searchType.date
+        code: 'accDate', 
+        title: mixins.$t('pastThirthtyDays'),
+        defaultValue: 5, 
+        searchType: Constants.searchType.date
+      },
+      { 
+        code: 'mac', 
+        title: mixins.$t('settlement'),  
+        dropType: 'settlement'
       },
-      { code: 'mac', title: mixins.$t('settlement'),  dropType: 'settlement',searchType: Constants.searchType.dropSingle },
     ],
     // 列表区（内容）
     contentList: [
@@ -62,7 +68,6 @@ Page({
     // params.rpType = Constants.rpType.receipt
     // params.staffIdList = params.staffIds
     // params.orgIdList = params.orgIds
-     
     return params;
   },