出库明细报表

src/locale/lang/zh-CN.js

@@ -576,9 +576,16 @@ export const columns = {
   intoingAmtSum:'入库中总金额',
   intoQtySum:'已入库总量',
   intoAmtSum:'已入库总金额',
-  returnQtySum:'已入库退货总量',
-  returnAmtSum:'已入库退货总金额',
+  returnInQtySum:'已入库退货总量',
+  returnInAmtSum:'已入库退货总金额',
   sumShouldHandle:'待核销金额',
+  outTypeName:'出库类型',
+  outingQtySum :'出库中总量',
+  outingAmtSum:'出库中总金额',
+  outQtySum:'已出库总量',
+  outAmtSum:'已出库总金额',
+  returnOutQtySum:'已出库退货总量',
+  returnOutAmtSum:'已出库退货总金额',
 }
 
 /**

src/view/report/detail-report/index.vue

@@ -120,9 +120,14 @@ export default {
       let filters = this.searchContent.filter(it => it.valueKind == 'M-CHOICE' || it.valueKind == 'S-CHOICE');
       if (filters && filters.length > 0) {
         filters.forEach(it => {
+          params = {}
           if (it.valueFormat && it.valueFormat.service && it.valueFormat.method) {
+            // TODO
+            // if(it.valueFormat.searchp){
+            //   params[]
+            // }
             this.excute(this.$service[it.valueFormat.service],
-              this.$service[it.valueFormat.service][it.valueFormat.method], {}).then(res => {
+              this.$service[it.valueFormat.service][it.valueFormat.method], params).then(res => {
               if (res.code === this.$config.SUCCESS_CODE) {
                 let data = []
                 if (res.data && res.data.list) {

src/view/report/detail-report/setting.js

@@ -344,8 +344,8 @@ const data = {
       {field: 'intoingAmtSum',type:'number'},
       {field: 'intoQtySum',type:'number'},
       {field: 'intoAmtSum',type:'number'},
-      {field: 'returnQtySum',type:'number'},
-      {field: 'returnAmtSum',type:'number'},
+      {field: 'returnInQtySum',type:'number'},
+      {field: 'returnInAmtSum',type:'number'},
       {field: 'amtPayable',type:'number'},
       {field: 'amtResidue',type:'number'},
       {field: 'remarks', width: 'auto'}
@@ -381,11 +381,78 @@ const data = {
     methodsName: 'getOutboundDetailReport',
     // 查询条件
     searchContent: [
-      {itemCode: 'orgCode'},
-      {itemCode: 'orgName'},
+      // 出库单号
+      {itemCode: 'outNo'},
+      // 出库类型
+      {
+        itemCode: 'outTypeName',
+        valueFormat: {
+          code: 'outTypeList',
+          service:'commonService',
+          method:'getDataKind',
+          data: [],
+          valueKey: 'id',
+          labelKey: 'kindName',
+        },
+        valueKind: 'M-CHOICE'
+      },
+      // 来源单号
+      {itemCode: 'fromNo'},
+      // 供应商
+      {
+        itemCode: 'supplierName',
+        valueFormat: {
+          code: 'supIdlist',
+        },
+        valueKind: 'M-SEARCH',
+        magnifierType: Config.MagnifierType.supplier,
+      },
+      // 客户名称
+      {itemCode: 'cusName'},
+      // 客户电话
+      {
+        itemCode: 'cusPhone',
+        valueFormat: {
+          code: 'cusPhone',
+        },
+        valueKind: 'M-SEARCH',
+        magnifierType: Config.MagnifierType.customer,
+      },
+
+      // 出库日期
+      {
+        itemCode: 'outDate',
+        valueFormat: {
+          code: 'outDate',
+        },
+        valueKind: 'DATE_RANGE'
+      },
+      // 制单日期
+      {
+        itemCode: 'makeTime',
+        valueFormat: {
+          code: 'makeTime',
+        },
+        valueKind: 'DATE_RANGE'
+      },
+      // 业务部门
+      {
+        itemCode: 'orgId',
+        itemName: 'orgName',
+        valueFormat: {
+          code: 'orgIdList',
+          service:'commonService',
+          method:'getOrg',
+          data: [],
+          valueKey: 'orgId',
+          labelKey: 'orgName',
+        },
+        valueKind: 'M-CHOICE'
+      },
+      // 业务员
       {
         itemCode: 'staffId',
-        itemName: '业务员',
+        itemName: 'staffName',
         valueFormat: {
           code: 'staffIdList',
           service:'commonService',
@@ -396,19 +463,100 @@ const data = {
         },
         valueKind: 'M-CHOICE'
       },
-
+      //商品名称
+      {itemCode: 'skuName'},
+      //商品型号
+      {itemCode: 'skuModel'},
+      // 品牌
+      {
+        itemCode: 'brandIds',
+        valueFormat: {
+          code: 'goodsBrandList',
+          service:'goodsBrandService',
+          method:'selectByCond',
+          data: [],
+          valueKey: 'brandId',
+          labelKey: 'brandName',
+        },
+        valueKind: 'M-CHOICE'
+      },
+      // 系列
+      {
+        itemCode: 'series',
+        valueFormat: {
+          code: 'goodsSeriesList',
+          service:'goodsSeriesService',
+          method:'getGoodsSeriesList',
+          data: [],
+          valueKey: 'seriesId',
+          labelKey: 'seriesName',
+        },
+        valueKind: 'M-CHOICE'
+      },
+      // 种类
+      {
+        itemCode: 'category',
+        valueFormat: {
+          code: 'goodsCategoryList',
+          service:'goodsCategoryService',
+          method:'selectByCond',
+          data: [],
+          valueKey: 'catId',
+          labelKey: 'catName',
+        },
+        valueKind: 'M-CHOICE'
+      },
+      // 仓位
+      {
+        itemCode: 'whName',
+        valueFormat: {
+          code: 'whList',
+          service:'commonService',
+          method:'getWarehouse',
+          data: [],
+          valueKey: 'whId',
+          labelKey: 'whName',
+        },
+        valueKind: 'M-CHOICE'
+      },
       {itemCode: 'flgViewItem',valueKind:'SWITCH',itemName:'查看明细'},
     ],
-
     // 列表列
     columns: [
-      {field: 'orgCode'},
+      {field: 'outNo'},
+      {field: 'fromNo'},
+      {field: 'outTypeName'},
+      {field: 'outStatusName'},
+      {field: 'supplierName'},
+      {field: 'cusName'},
+      {field: 'cusPhone'},
+      {field: 'cusFrom'},
+      {field: 'outDate',type: 'date'},
       {field: 'orgName'},
+      {field: 'staffName'},
+      {field: 'makeStaffName'},
+      {field: 'outingQtySum',type:'number'},
+      {field: 'outingAmtSum',type:'number'},
+      {field: 'outQtySum',type:'number'},
+      {field: 'outAmtSum',type:'number'},
+      {field: 'returnOutQtySum',type:'number'},
+      {field: 'returnOutAmtSum',type:'number'},
       {field: 'remarks', width: 'auto'}
     ],
     detailColumns:[
-      {field: 'orgCode1'},
-      {field: 'orgName2'},
+      {field: 'skuName'},
+      {field: 'skuModel'},
+      {field: 'nonStdCode'},
+      {field: 'shortName'},
+      {field: 'catName'},
+      {field: 'seriesName'},
+      {field: 'whName'},
+      {field: 'outingQty',type:'number'},
+      {field: 'outingAmt',type:'number'},
+      {field: 'outQty',type:'number'},
+      {field: 'outAmt',type:'number'},
+      {field: 'returnQty',type:'number'},
+      {field: 'returnAmt',type:'number'},
     ]
   },
   // 入库明细报表
@@ -421,11 +569,65 @@ const data = {
     methodsName: 'inbound_detail_report',
     // 查询条件
     searchContent: [
-      {itemCode: 'orgCode'},
-      {itemCode: 'orgName'},
+      // 出库单号
+      {itemCode: 'intoNo'},
+      // 来源单号
+      {itemCode: 'fromNo'},
+      // 供应商
+      {
+        itemCode: 'supplierName',
+        valueFormat: {
+          code: 'supIdlist',
+        },
+        valueKind: 'M-SEARCH',
+        magnifierType: Config.MagnifierType.supplier,
+      },
+      // 客户名称
+      {itemCode: 'cusName'},
+      // 客户电话
+      {
+        itemCode: 'cusPhone',
+        valueFormat: {
+          code: 'cusPhone',
+        },
+        valueKind: 'M-SEARCH',
+        magnifierType: Config.MagnifierType.customer,
+      },
+
+      // 出库日期
+      {
+        itemCode: 'intoDate',
+        valueFormat: {
+          code: 'intoDate',
+        },
+        valueKind: 'DATE_RANGE'
+      },
+      // 制单日期
+      {
+        itemCode: 'makeTime',
+        valueFormat: {
+          code: 'makeTime',
+        },
+        valueKind: 'DATE_RANGE'
+      },
+      // 业务部门
+      {
+        itemCode: 'orgId',
+        itemName: 'orgName',
+        valueFormat: {
+          code: 'orgIdList',
+          service:'commonService',
+          method:'getOrg',
+          data: [],
+          valueKey: 'orgId',
+          labelKey: 'orgName',
+        },
+        valueKind: 'M-CHOICE'
+      },
+      // 业务员
       {
         itemCode: 'staffId',
-        itemName: '业务员',
+        itemName: 'staffName',
         valueFormat: {
           code: 'staffIdList',
           service:'commonService',
@@ -436,19 +638,100 @@ const data = {
         },
         valueKind: 'M-CHOICE'
       },
-
+      //商品名称
+      {itemCode: 'skuName'},
+      //商品型号
+      {itemCode: 'skuModel'},
+      // 品牌
+      {
+        itemCode: 'brandIds',
+        valueFormat: {
+          code: 'goodsBrandList',
+          service:'goodsBrandService',
+          method:'selectByCond',
+          data: [],
+          valueKey: 'brandId',
+          labelKey: 'brandName',
+        },
+        valueKind: 'M-CHOICE'
+      },
+      // 系列
+      {
+        itemCode: 'series',
+        valueFormat: {
+          code: 'goodsSeriesList',
+          service:'goodsSeriesService',
+          method:'getGoodsSeriesList',
+          data: [],
+          valueKey: 'seriesId',
+          labelKey: 'seriesName',
+        },
+        valueKind: 'M-CHOICE'
+      },
+      // 种类
+      {
+        itemCode: 'category',
+        valueFormat: {
+          code: 'goodsCategoryList',
+          service:'goodsCategoryService',
+          method:'selectByCond',
+          data: [],
+          valueKey: 'catId',
+          labelKey: 'catName',
+        },
+        valueKind: 'M-CHOICE'
+      },
+      // 仓位
+      {
+        itemCode: 'whName',
+        valueFormat: {
+          code: 'whList',
+          service:'commonService',
+          method:'getWarehouse',
+          data: [],
+          valueKey: 'whId',
+          labelKey: 'whName',
+        },
+        valueKind: 'M-CHOICE'
+      },
       {itemCode: 'flgViewItem',valueKind:'SWITCH',itemName:'查看明细'},
     ],
-
     // 列表列
     columns: [
-      {field: 'orgCode'},
+      {field: 'outNo'},
+      {field: 'fromNo'},
+      {field: 'outTypeName'},
+      {field: 'outStatusName'},
+      {field: 'supplierName'},
+      {field: 'cusName'},
+      {field: 'cusPhone'},
+      {field: 'cusFrom'},
+      {field: 'outDate',type: 'date'},
       {field: 'orgName'},
+      {field: 'staffName'},
+      {field: 'makeStaffName'},
+      {field: 'outingQtySum',type:'number'},
+      {field: 'outingAmtSum',type:'number'},
+      {field: 'outQtySum',type:'number'},
+      {field: 'outAmtSum',type:'number'},
+      {field: 'returnOutQtySum',type:'number'},
+      {field: 'returnOutAmtSum',type:'number'},
       {field: 'remarks', width: 'auto'}
     ],
     detailColumns:[
-      {field: 'orgCode1'},
-      {field: 'orgName2'},
+      {field: 'skuName'},
+      {field: 'skuModel'},
+      {field: 'nonStdCode'},
+      {field: 'shortName'},
+      {field: 'catName'},
+      {field: 'seriesName'},
+      {field: 'whName'},
+      {field: 'outingQty',type:'number'},
+      {field: 'outingAmt',type:'number'},
+      {field: 'outQty',type:'number'},
+      {field: 'outAmt',type:'number'},
+      {field: 'returnQty',type:'number'},
+      {field: 'returnAmt',type:'number'},
     ]
   },
 }