1、修改明细报表

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

@@ -112,6 +112,23 @@
               </view>
             </view>
           </view>
+          <!--根据contentCol切换-->
+          <view wx:if="{{contentCol}}" class="table-content-row-detail" wx:for="{{contentObj[item[contentCol]]}}" wx:for-item="col" data-item="{{col}}">
+            <view style="display: flex;justify-content: space-between;align-items: center;">
+              <!--左侧-->
+              <view class="table-content-class">
+                <dk-title wx:if="{{col.left.type == 'title'}}" titleTag="{{item[col.left.tag]}}" title="{{item[col.left.title]}}"></dk-title>
+                <dk-cell wx:if="{{col.left.type == 'price'}}" left="0rpx" height="50rpx" contentRight="{{false}}" contentFontSize="17" contentColor="#FF7B1A" contentFontWeight="bold" content="{{item[col.left.name]?item[col.left.name]:0}}"></dk-cell>
+                <view wx:if="{{col.left.type != 'title' && col.left.type != 'price'}}" style="display: flex; color:{{col.left.type == 'qty'?'#95A8CB':'002340'}}">
+                  <view wx:if="{{col.left.type == 'qty'}}">x</view>{{item[col.left.name]?(col.left.title?col.left.title:'') + item[col.left.name]:''}}
+                </view>
+              </view>
+              <!--右侧-->
+              <view class="table-content-class" style="display: flex;color:{{col.right.type == 'qty'?'#95A8CB':'002340'}}">
+                <view wx:if="{{col.right.type == 'qty'}}">x</view>{{item[col.right.name]?item[col.right.name]:''}}
+              </view>
+            </view>
+          </view>
         </view>
 
         <!-- 分割线 -->

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

@@ -26,7 +26,7 @@ Page({
     // 方法
     method: '',
     // 导出的方法（可能会跟查询方法不一致）（对应mapper中的方法）
-    exportMethod:'',
+    exportMethod: '',
     // 查询条件
     searchContent: [],
     // 查询条件-筛选
@@ -123,6 +123,8 @@ Page({
     let pullMenuList = []
     let searchContent = []
     let content = []
+    let contentObj = {}
+    let contentCol = null
     let footerAmount = {}
     let footerInfo = []
     let routeObjName = ''
@@ -139,10 +141,11 @@ Page({
         routeObjName = 'report'
         method = 'getOutboundDetailReport'
         placeholder = ['orderNo', 'customerName', 'telephone']
+        contentCol = 'outStatusName'
         listTitle = 'outNo'
         listStatus = 'outStatusName'
         listSubTitle = 'outDate'
-        otherSearchParams = {flgViewItem:true}
+        otherSearchParams = { flgViewItem: true }
         pullMenuList = [{
           code: 'outStatus',
           pullType: 'mSelect',
@@ -169,7 +172,7 @@ Page({
           title: mixins.$t('choose'),//'筛选',
           searchType: Constants.searchType.pick
         }]
-        content = [
+        contentObj = {'已出库':[
           {
             left: { tag: 'skuModel', title: 'skuName', type: 'title' },
           },
@@ -180,47 +183,61 @@ Page({
           {
             left: { name: 'outDate', title: '日期：' },
             right: { name: 'whName' },
-          }]
-          exportCols = {
-            "outNo": "出库单号",
-            "fromNo": "来源单号",
-            "outTypeName": "出库类型",
-            "outStatusName": "出库状态",
-            "supplierName": "供应商",
-            "cusName": "客户名称",
-            "cusPhone": "客户电话",
-            "cusFrom": "客户来源",
-            "outDate": "出库日期",
-            "orgName": "部门名称",
-            "staffName": "员工姓名",
-            "makeStaffName": "制单员",
-            "outingQtySum": "出库中总量",
-            "outingAmtSum": "出库中总金额",
-            "outQtySum": "已出库总量",
-            "outAmtSum": "已出库总金额",
-            "returnOutQtySum": "已出库退货总量",
-            "returnOutAmtSum": "已出库退货总金额",
-            "remarks": "备注",
-            "skuName": "商品名称",
-            "skuModel": "商品型号",
-            "nonStdCode": "非标号",
-            "shortName": "商品品牌",
-            "catName": "种类名称",
-            "seriesName": "系列名称",
-            "whName": "仓库名称",
-            "outingQty": "出库中数量",
-            "outingAmt": "出库中金额",
-            "outQty": "已出库数量",
-            "outAmt": "已出库金额",
-            "returnQty": "已出库退货数量",
-            "returnAmt": "已出库退货金额"
-          }
+          }],
+          '出库中':[
+            {
+              left: { tag: 'skuModel', title: 'skuName', type: 'title' },
+            },
+            {
+              left: { name: 'outIngAmt', type: 'price' },
+              right: { name: 'outIngQty', type: 'qty' }
+            },
+            {
+              left: { name: 'outDate', title: '日期：' },
+              right: { name: 'whName' },
+            }],
+        }
+        exportCols = {
+          "outNo": "出库单号",
+          "fromNo": "来源单号",
+          "outTypeName": "出库类型",
+          "outStatusName": "出库状态",
+          "supplierName": "供应商",
+          "cusName": "客户名称",
+          "cusPhone": "客户电话",
+          "cusFrom": "客户来源",
+          "outDate": "出库日期",
+          "orgName": "部门名称",
+          "staffName": "员工姓名",
+          "makeStaffName": "制单员",
+          "outingQtySum": "出库中总量",
+          "outingAmtSum": "出库中总金额",
+          "outQtySum": "已出库总量",
+          "outAmtSum": "已出库总金额",
+          "returnOutQtySum": "已出库退货总量",
+          "returnOutAmtSum": "已出库退货总金额",
+          "remarks": "备注",
+          "skuName": "商品名称",
+          "skuModel": "商品型号",
+          "nonStdCode": "非标号",
+          "shortName": "商品品牌",
+          "catName": "种类名称",
+          "seriesName": "系列名称",
+          "whName": "仓库名称",
+          "outingQty": "出库中数量",
+          "outingAmt": "出库中金额",
+          "outQty": "已出库数量",
+          "outAmt": "已出库金额",
+          "returnQty": "已出库退货数量",
+          "returnAmt": "已出库退货金额"
+        }
         break;
-       // 入库明细表
-       case Constants.menuCode.inboundDetailReport:
+      // 入库明细表
+      case Constants.menuCode.inboundDetailReport:
         routeObjName = 'report'
         method = 'getInboundDetailReport'
-        otherSearchParams = {flgViewItem:true}
+        contentCol = 'intoStatusName'
+        otherSearchParams = { flgViewItem: true }
         placeholder = ['orderNo', 'supplierName', 'telephone']
         listTitle = 'intoNo'
         listStatus = 'intoStatusName'
@@ -251,54 +268,68 @@ Page({
           title: mixins.$t('choose'),//'筛选',
           searchType: Constants.searchType.pick
         }]
-        content = [
-          {
-            left: { tag: 'skuModel', title: 'skuName', type: 'title' },
-          },
-          {
-            left: { name: 'intoAmt', type: 'price' },
-            right: { name: 'intoQty', type: 'qty' }
-          },
-          {
-            left: { name: 'intoDate', title: '日期：' },
-            right: { name: 'whName' },
-          }]
-          exportCols = {
-            "intoNo": "入库单号",
-            "fromNo": "来源单号",
-            "intoTypeName": "入库类型",
-            "intoStatusName": "入库状态",
-            "supplierName": "供应商",
-            "cusName": "客户名称",
-            "cusPhone": "客户电话",
-            "cusFrom": "客户来源",
-            "intoDate": "入库日期",
-            "orgName": "部门名称",
-            "staffName": "员工姓名",
-            "makeStaffName": "制单员",
-            "intoingQtySum": "入库中总量",
-            "intoingAmtSum": "入库中总金额",
-            "intoQtySum": "已入库总量",
-            "intoAmtSum": "已入库总金额",
-            "returnInQtySum": "已入库退货总量",
-            "returnInAmtSum": "已入库退货总金额",
-            "remarks": "备注",
-            "skuName": "商品名称",
-            "skuModel": "商品型号",
-            "nonStdCode": "非标号",
-            "shortName": "商品品牌",
-            "catName": "种类名称",
-            "seriesName": "系列名称",
-            "whName": "仓库名称",
-            "intoingQty": "入库中数量",
-            "intoingAmt": "入库中金额",
-            "intoQty": "已入库数量",
-            "intoAmt": "已入库金额",
-            "returnQty": "已出库退货数量",
-            "returnAmt": "已出库退货金额"
-          }
-        break; 
-        // 销售明细表
+        contentObj = {
+          '已入库': [
+            {
+              left: { tag: 'skuModel', title: 'skuName', type: 'title' },
+            },
+            {
+              left: { name: 'intoAmt', type: 'price' },
+              right: { name: 'intoQty', type: 'qty' }
+            },
+            {
+              left: { name: 'intoDate', title: '日期：' },
+              right: { name: 'whName' },
+            }],
+          '入库中': [
+            {
+              left: { tag: 'skuModel', title: 'skuName', type: 'title' },
+            },
+            {
+              left: { name: 'intoIngAmt', type: 'price' },
+              right: { name: 'intoIngQty', type: 'qty' }
+            },
+            {
+              left: { name: 'makeTime', title: '日期：' },
+              right: { name: 'whName' },
+            }]
+        }
+        exportCols = {
+          "intoNo": "入库单号",
+          "fromNo": "来源单号",
+          "intoTypeName": "入库类型",
+          "intoStatusName": "入库状态",
+          "supplierName": "供应商",
+          "cusName": "客户名称",
+          "cusPhone": "客户电话",
+          "cusFrom": "客户来源",
+          "intoDate": "入库日期",
+          "orgName": "部门名称",
+          "staffName": "员工姓名",
+          "makeStaffName": "制单员",
+          "intoingQtySum": "入库中总量",
+          "intoingAmtSum": "入库中总金额",
+          "intoQtySum": "已入库总量",
+          "intoAmtSum": "已入库总金额",
+          "returnInQtySum": "已入库退货总量",
+          "returnInAmtSum": "已入库退货总金额",
+          "remarks": "备注",
+          "skuName": "商品名称",
+          "skuModel": "商品型号",
+          "nonStdCode": "非标号",
+          "shortName": "商品品牌",
+          "catName": "种类名称",
+          "seriesName": "系列名称",
+          "whName": "仓库名称",
+          "intoingQty": "入库中数量",
+          "intoingAmt": "入库中金额",
+          "intoQty": "已入库数量",
+          "intoAmt": "已入库金额",
+          "returnQty": "已出库退货数量",
+          "returnAmt": "已出库退货金额"
+        }
+        break;
+      // 销售明细表
       case Constants.menuCode.orderDetailReport:
         routeObjName = 'report'
         method = 'getSalesItemReport'
@@ -390,7 +421,7 @@ Page({
       case Constants.menuCode.purDetailReport:
         routeObjName = 'report'
         method = 'getPurDetailReport'
-        otherSearchParams = {flgViewItem:true}
+        otherSearchParams = { flgViewItem: true }
         placeholder = ['purNo', 'supName', 'telephone']
         listTitle = 'purNo'
         listStatus = 'intoStatus'
@@ -431,33 +462,33 @@ Page({
           },
           {
             left: { name: 'nonStdCode', title: '批次号：' },
-       
+
           }]
-          exportCols = {
-            purNo: "采购订单号"	,
-            pickupDate: "取货日期"	,
-            purStatusName: "订单状态"	,
-            purTypeName: "采购单据类型"	,
-            orgName: "部门名称"	,
-            staffName: "员工姓名"	,
-            supplierName: "供应商"	,
-            contactName: "联系人"	,
-            contactPhone: "联系电话"	,
-            amtPayable: "应付金额"	,
-            amtResidue: "剩余金额"	,
-            makeStaffName: "制单员"	,
-            skuModel: "商品型号"	,
-            skuName: "商品名称"	,
-            catName: "种类名称"	,
-            itemQty: "商品数量"	,
-            pricePur: "采购价"	,
-            intoAmt: "已入库金额"	,
-            intoQty: "已入库数量"	,
-            seriesName: "系列名称"	,
-            shortName: "商品品牌"	,
-            nonStdCode: "非标号"	,
-            remarks: "备注"	
-          }
+        exportCols = {
+          purNo: "采购订单号",
+          pickupDate: "取货日期",
+          purStatusName: "订单状态",
+          purTypeName: "采购单据类型",
+          orgName: "部门名称",
+          staffName: "员工姓名",
+          supplierName: "供应商",
+          contactName: "联系人",
+          contactPhone: "联系电话",
+          amtPayable: "应付金额",
+          amtResidue: "剩余金额",
+          makeStaffName: "制单员",
+          skuModel: "商品型号",
+          skuName: "商品名称",
+          catName: "种类名称",
+          itemQty: "商品数量",
+          pricePur: "采购价",
+          intoAmt: "已入库金额",
+          intoQty: "已入库数量",
+          seriesName: "系列名称",
+          shortName: "商品品牌",
+          nonStdCode: "非标号",
+          remarks: "备注"
+        }
         break;
       // 客户收款明细表
       case Constants.menuCode.cusReceiptDetailReport:
@@ -526,6 +557,8 @@ Page({
       footerInfo: footerInfo,
       otherSearchParams: otherSearchParams,
       exportCols: exportCols,
+      contentCol: contentCol,
+      contentObj: contentObj,
       service: app.globalData[routeObjName + 'Service']
     })
   }

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

@@ -10,7 +10,7 @@
 <van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}" />
 
 <!-- 列表区 -->
-<dk-list list="{{tableData}}" detailReportFlag="{{true}}" titleImageFlag="{{false}}" flgPoint="{{false}}" title="{{listTitle}}" subTitle="{{listSubTitle}}" status="{{listStatus}}" buttonList="{{popbuttonList}}" content="{{content}}" ></dk-list>
+<dk-list list="{{tableData}}" detailReportFlag="{{true}}" titleImageFlag="{{false}}" flgPoint="{{false}}" title="{{listTitle}}" subTitle="{{listSubTitle}}" status="{{listStatus}}" buttonList="{{popbuttonList}}" content="{{content}}" contentCol="{{contentCol}}" contentObj="{{contentObj}}" ></dk-list>
 
 <!-- 显示没用更多 -->
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>