1、修改相关问题

api/pages/report/report.js

@@ -34,7 +34,9 @@ module.exports = {
     // 收发存汇总表-明细
     getIvtItemReport: 'get_ivt_item_report',
     // 库存明细导出
-    getIvtDetailReport:'get_ivt_detail_report'
+    getIvtDetailReport:'get_ivt_detail_report',
+    // 客户收款明细表
+    getRecPayDetailReport:'get_rec_pay_detail_report'
   },
   routeUrl: {
     report: {

components/dkbusiness/dk-label-multiple-select/dk-label-multiple-select.js

@@ -459,22 +459,17 @@ Component({
       }
 
       //收款进度
-      if (typeName === 'receiveStatus') {
-        dataSourceCode = 'receiveStatus'
-        name = '收款进度'
+      if (typeName === 'rpType') {
+        dataSourceCode = 'rpType'
+        name = '收付款类型'
         let stowList = [{
-          name: '未收款',
-          id: 0,
-          infotype: 'default'
-        },
-        {
-          name: '部分收款',
-          id: 1,
+          name: '收款',
+          id: '收付款类型-收款',
           infotype: 'default'
         },
         {
-          name: '收款完成',
-          id: 2,
+          name: '退收款',
+          id: '收付款类型-收款',
           infotype: 'default'
         }
         ];

i18n/zh-CN.js

@@ -415,6 +415,7 @@ const accountsManage = {
   thawing: '解冻',
   freeze: '冻结',
   freezeInfo: '冻结信息',
+  rpType:'收付款类型',
 }
 // 客户
 const customer = {

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

@@ -60,6 +60,8 @@ Page({
       name: 'confirm',
       title: '确定'
     }],
+    // 新加的数据
+    addItem:null,
   },
   /**
    * @desc : 调到新建
@@ -446,6 +448,9 @@ Page({
   saveData(params) {
     let routeObjNamePop = this.data.routeObjNamePop
     if (!routeObjNamePop) return;
+    this.setData({
+      addItem:null
+    })
     let service = app.globalData[routeObjNamePop + 'Service']
     let defaultFlag = this.data.defaultFlag;
     // 没有默认值就直接保存
@@ -459,8 +464,16 @@ Page({
           })
           if (res.data.data) {
             setTimeout(() => {
-              // 执行点击事件
-              this._toDetail(res.data.data)
+              // 多选就选中
+              if(this.data.chooseFlag){
+                this.setData({
+                  addItem:res.data.data
+                })
+                this.searchData();
+              }else{
+                // 执行点击事件
+                this._toDetail(res.data.data)
+              }
             }, 2000)
           }
         }
@@ -580,6 +593,7 @@ Page({
           addUrl: '/package-basic-data/pages/role/add/add',
           routeObjName: 'common',
           method: 'getRole',
+          valueKey:'roleId',
           title: 'roleName',
           chooseFlag: route.chooseFlag,
           contentList: [{
@@ -596,6 +610,7 @@ Page({
           addUrl: app.globalData.company.gradeCode == Constants.gradeCode.STD ? null : '/package-basic-data/pages/org/org',
           routeObjName: 'common',
           method: 'getOrg',
+          valueKey:'orgId',
           title: 'orgName',
           contentList: [{
             name: 'orgCode',
@@ -611,6 +626,7 @@ Page({
           addUrl: '/package-basic-data/pages/staff/add/add',
           routeObjName: 'common',
           method: 'getStaff',
+          valueKey:'staffId',
           title: 'staffName',
           contentList: [{
             name: 'staffCode',
@@ -629,9 +645,9 @@ Page({
       case Constants.chooseType.cusFrom:
         title = "客户来源"
         this.setData({
-
           routeObjName: 'common',
           method: 'getInitData',
+          valueKey:'dataId',
           title: 'dataValue',
           contentList: [{
             name: 'dataCode',
@@ -653,6 +669,7 @@ Page({
           routeObjName: 'common',
           pageFlag: false,
           method: 'getMac',
+          valueKey:'macId',
           title: 'macName',
           contentList: [{
             name: 'macCode',
@@ -674,11 +691,11 @@ Page({
         this.setData({
           routeObjName: 'common',
           method: 'getInitData',
+          valueKey:'channelId',
           title: 'channelName',
           simpleFlag: true,
           placeholder: ['channelName']
         })
-        console.log('rrrrr', this.data.simpleFlag);
         break;
       // 供应商
       case Constants.chooseType.supplier:
@@ -735,6 +752,7 @@ Page({
           routeObjName: 'common',
           routeObjNamePop: 'warehouse',
           method: 'getWarehouseListBy',
+          valueKey:'whId',
           title: 'whName',
           contentList: [{
             name: 'supervisor',
@@ -1014,14 +1032,25 @@ Page({
  * @author : 刘尧
  */
   handleSearchData(tableData) {
+    console.log('tte',this.data.addItem,this.data.tableData,this.data.valueKey);
+    let addItem = this.data.addItem
+    let valueKey = this.data.valueKey
+    let choosedData = this.data.choosedData
     tableData.forEach(item => {
+      if(addItem && valueKey){
+        if(item[valueKey] == addItem[valueKey]){
+          item.checked = true;
+          choosedData.push({...item});
+        }
+      }
       // 判断数据中是否存在计量单位的小数位数字段
       if (item && (item.decimalPlaces || item.decimalPlaces === 0)) {
         item.decimalPlacesStr = '小数：' + item.decimalPlaces
       }
     })
     this.setData({
-      tableData: tableData
+      tableData: tableData,
+      choosedData:choosedData
     })
   }
 })

package-business-analysis/pages/detail-report/detail-report.js

@@ -87,7 +87,6 @@ Page({
    * @author : 周兴
    */
   getData(params) {
-    console.log("getData");
     // 只有加载完毕才会走查询
     if (!this.data.loadFlag) {
       return;
@@ -160,7 +159,7 @@ Page({
         contentCol = 'outStatusName'
         listTitle = 'outNo'
         listStatus = 'outStatusName'
-        listSubTitle = 'outDate'
+        listSubTitle = 'outTypeName'
         otherSearchParams = { flgViewItem: true }
         pullMenuList = [
           {
@@ -172,7 +171,7 @@ Page({
             code: 'outStatus',
             pullType: 'mSelect',
             typeName: 'outStatus'
-          }, 
+          },
           {
             code: 'staffName',
           },
@@ -180,20 +179,20 @@ Page({
             code: 'orgName',
           },
           {
-            code: 'skuName', 
+            code: 'skuName',
           },
           {
-            code: 'skuModel', 
-          },          
+            code: 'skuModel',
+          },
           {
-            code: 'nonStdCode', 
+            code: 'nonStdCode',
             title: '色号'
           },
           {
-            code: 'brandName', 
+            code: 'brandName',
           },
           {
-            code: 'whName', 
+            code: 'whName',
           },
         ]
 
@@ -202,6 +201,7 @@ Page({
             [
               {
                 left: { tag: 'brandName', title: 'skuModel', type: 'title' },
+                right:{ name: 'outDate'},
               },
               {
                 left: { name: 'skuName', },
@@ -223,6 +223,7 @@ Page({
             [
               {
                 left: { tag: 'brandName', title: 'skuModel', type: 'title' },
+                right:{ name: 'outDate'},
               },
               {
                 left: { name: 'skuName', },
@@ -539,43 +540,56 @@ Page({
         break;
       // 客户收款明细表
       case Constants.menuCode.cusReceiptDetailReport:
-        routeObjName = 'saleReport'
-        method = 'getSalesItemReport'
-        placeholder = ['orderNo', 'customerName', 'telephone']
-        listTitle = 'orderNo'
-        listStatus = 'outStatusName'
-        listSubTitle = 'cusPhone'
+        routeObjName = 'report'
+        method = 'getRecPayDetailReport'
+        placeholder = ['rpNo', 'customerName', 'telephone']
+        listTitle = 'rpNo'
+        listStatus = 'rpTypeName'
+        listSubTitle = 'accDate'
         pullMenuList = [{
-          code: 'outStatus',
+          code: 'rpType',
           pullType: 'mSelect',
-          typeName: 'outStatus'
-        }, {
-          code: 'receiveStatus',
-          pullType: 'mSelect',
-          typeName: 'receiveStatus'
-        }, {
-          code: 'followCount',
-          dataType: 'number'
-        }, {
-          code: 'nextFollowTime',
-          dataType: 'date'
-        }]
+          typeName: 'rpType'
+        }, 
+        {
+          code: 'staffName',
+        },
+        {
+          code: 'orgName',
+        },]
 
         content = [
           {
-            left: { tag: 'brandName', title: 'skuName', type: 'title' },
+            left: { name: 'cusName' },
+            right: { name: 'cusPhone' },
           },
           {
             left: { name: 'orgName' },
+            right: { name: 'staffName' },
           },
           {
-            left: { name: 'priceSale', type: 'price' },
-            right: { name: 'itemQty', type: 'qty' }
+            left: { name: 'amtRec', type: 'price' },
+            right: { name: 'macName' },
           },
           {
             left: { name: 'pickupDate', title: '日期：' },
-            right: { name: 'whName' },
           }]
+        exportCols = {
+          "rpNo": "收款单号",
+          "rpTypeName": "收付款类型",
+          "cusName": "客户名称",
+          "cusPhone": "客户电话",
+          "contactName": "联系人",
+          "contactPhone": "联系电话",
+          "addressFull": "详细地址",
+          "accDate": "账务日期",
+          "macName": "账户名称",
+          "orgName": "部门名称",
+          "staffName": "员工姓名",
+          "makeStaffName": "制单员",
+          "makeTime": "制单时间",
+          "remarks": "备注"
+        }
         break;
       default:
         break;

pages/home-page/home-page.js

@@ -279,6 +279,12 @@ Page({
            filters[0].menuName = '订单开单'
            filters[0].name = '订单开单'
           }
+           // 出库明细表修改为销售明细表
+           filters = comMenuList.filter(it => it.objectCode == 'out-detail-report');
+           if (filters && filters.length > 0) {
+               filters[0].menuName = '销售明细表'
+               filters[0].name = '销售明细表'
+           }
        }
         // 增加全部列表
         let allMenu = {