出入库明细表

api/pages/report/report.js

@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright(c) 2024 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：
+ *		2.功能描述：报表
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		yjb		  	2024-4-18      1.00		       	新建
+ *******************************************************************************/
+module.exports = {
+  reportService: {
+    // 前缀
+    prefix: 'mdm-server/mst/report/',
+    //销售跟踪列表
+    getSalesTrackingReport: 'sales_tracking_report',
+    //销售跟踪明细
+    getSalesTrackingReportDetail: 'sale_tracking_report_detail',
+    // 销售明细表
+    getSalesItemReport: 'sales_item_report',
+    //采购跟踪列表
+    getPurTrackingReport: 'pur_tracking_report',
+    //采购跟踪明细
+    getPurTrackingReportDetail: 'pur_tracking_report_detail',
+    // 入库明细表
+    inboundDetailReport: 'inbound_detail_report',
+    // 出库明细表
+    outboundDetailReport: 'outbound_detail_report',
+
+  },
+  routeUrl: {
+    report: {
+      edit: {key: 'edit', url: '/package-purchase/pages/pur-track-report/detail/detail'},
+    }
+  }
+};

app.js

@@ -35,7 +35,7 @@ const basicData = require('./api/pages/mst/basicData.js');
 const customerMst = require('./api/pages/mst/customer.js');
 const purchase = require('./api/pages/pur/purchase.js');
 
-
+const report = require('./api/pages/report/report.js');
 const account = require('./api/pages/mac/account.js');
 const receiptPayment = require('./api/pages/mac/receiptPayment.js');
 const payment = require('./api/pages/mac/payment.js');
@@ -69,7 +69,7 @@ const freeze = require('./api/pages/ivt/freeze.js');
 const otherReceivable = require('./api/pages/mac/otherReceivable.js');
 const otherPayable = require('./api/pages/mac/otherPayable.js');
 const inventoryAdjustment = require('./api/pages/ivt/inventoryAdjustment.js');
-const report = require('./api/pages/mst/report.js');
+// const report = require('./api/pages/mst/report.js');
 const saleReport = require('./api/pages/mst/saleReport.js');
 const printLayout = require('./api/pages/mst/printLayout.js');
 const exportPage = require('./api/pages/common/export.js');

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

@@ -58,7 +58,7 @@
         </view>
 
         <!-- 图标-作废 收款 -->
-        <view wx:if="{{!item['flgValid']}}" class="status-view">
+        <view wx:if="{{item['flgValid'] !=null && !item['flgValid']}}" class="status-view">
           <van-image round width="150rpx" height="150rpx" src="{{imageUrl + statusImage}}" />
         </view>
 

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

@@ -22,7 +22,7 @@ Page({
     // 页面编码
     objectCode: null,
     // 页面标题
-    title:null,
+    title: null,
     // 方法
     method: '',
     // 查询条件
@@ -54,7 +54,7 @@ Page({
     // 导出的列
     exportCols: null,
     // 页面是否加载完毕，控制不要先走查询
-    loadFlag:false,
+    loadFlag: false,
   },
   /**
    * @desc : 设置查询参数
@@ -67,6 +67,15 @@ Page({
       // 把其他查询条件拼到查询实体上去
       params = Object.assign(params, otherSearchParams);
     }
+   
+    switch (this.data.objectCode) {
+      case Constants.menuCode.inboundDetailReport :
+      case Constants.menuCode.outboundDetailReport :
+        params.flgViewItem = true
+        break
+      default:
+        break
+    } 
     return params;
   },
   /** 
@@ -76,7 +85,7 @@ Page({
    */
   getData(params) {
     // 只有加载完毕才会走查询
-    if(!this.data.loadFlag){
+    if (!this.data.loadFlag) {
       return;
     }
     let service = this.data.service
@@ -97,7 +106,7 @@ Page({
       if (filters && filters.length > 0) {
         this.setData({
           objectCode: filters[0].objectCode,
-          title:filters[0].menuName
+          title: filters[0].menuName
         })
         // 设置页面标题
         wx.setNavigationBarTitle({
@@ -106,7 +115,7 @@ Page({
         // 根据objectCode设置页面各个属性
         this.setPropertis(filters[0].objectCode);
         this.setData({
-          loadFlag:true
+          loadFlag: true
         })
         // 查询
         this.searchData();
@@ -122,7 +131,7 @@ Page({
     wx.downloadFile({
       url: url,
       success: function (resd) {
-        if(resd.statusCode == Constants.SUCESS_CODE){
+        if (resd.statusCode == Constants.SUCESS_CODE) {
           const filePath = resd.tempFilePath
           // 说明有值
           if (filePath) {
@@ -163,7 +172,107 @@ Page({
     let listSubTitle = null
     let exportCols = null
     switch (objectCode) {
-      // 销售明细表
+      // 出库明细表
+      case Constants.menuCode.outboundDetailReport:
+        routeObjName = 'report'
+        method = 'outboundDetailReport'
+        placeholder = ['orderNo', 'customerName', 'telephone']
+        listTitle = 'outNo'
+        listStatus = 'outStatusName'
+        listSubTitle = 'outDate'
+        pullMenuList = [{
+          code: 'outStatus',
+          pullType: 'mSelect',
+          typeName: 'outStatus'
+        }, {
+          code: 'receiveStatus',
+          pullType: 'mSelect',
+          typeName: 'receiveStatus'
+        }, {
+          code: 'followCount',
+          dataType: 'number'
+        }, {
+          code: 'nextFollowTime',
+          dataType: 'date'
+        }]
+        searchContent = [{
+          code: 'makeTime',
+          title: mixins.$t('pastThirthtyDays'),//近30天',
+          defaultValue: 5,
+          searchType: Constants.searchType.date
+        },
+        {
+          code: 'choose',
+          title: mixins.$t('choose'),//'筛选',
+          searchType: Constants.searchType.pick
+        }]
+        content = [
+          {
+            left: { tag: 'skuModel', title: 'skuName', type: 'title' },
+          },
+          {
+            left: { name: 'orgName' },
+          },
+          {
+            left: { name: 'outAmt', type: 'price' },
+            right: { name: 'outQty', type: 'qty' }
+          },
+          {
+            left: { name: 'outDate', title: '日期：' },
+            right: { name: 'whName' },
+          }]
+        break;
+       // 入库明细表
+       case Constants.menuCode.inboundDetailReport:
+        routeObjName = 'report'
+        method = 'inboundDetailReport'
+        placeholder = ['orderNo', 'supplierName', 'telephone']
+        listTitle = 'intoNo'
+        listStatus = 'intoStatusName'
+        listSubTitle = 'intoDate'
+        pullMenuList = [{
+          code: 'intoStatus',
+          pullType: 'mSelect',
+          typeName: 'intoStatus'
+        }, {
+          code: 'receiveStatus',
+          pullType: 'mSelect',
+          typeName: 'receiveStatus'
+        }, {
+          code: 'followCount',
+          dataType: 'number'
+        }, {
+          code: 'nextFollowTime',
+          dataType: 'date'
+        }]
+        searchContent = [{
+          code: 'makeTime',
+          title: mixins.$t('pastThirthtyDays'),//近30天',
+          defaultValue: 5,
+          searchType: Constants.searchType.date
+        },
+        {
+          code: 'choose',
+          title: mixins.$t('choose'),//'筛选',
+          searchType: Constants.searchType.pick
+        }]
+        content = [
+          {
+            left: { tag: 'skuModel', title: 'skuName', type: 'title' },
+          },
+          {
+            left: { name: 'orgName' },
+          },
+          {
+            left: { name: 'intoAmt', type: 'price' },
+            right: { name: 'intoQty', type: 'qty' }
+          },
+          {
+            left: { name: 'intoDate', title: '日期：' },
+            right: { name: 'whName' },
+          }]
+        break; 
+        // 销售明细表
       case Constants.menuCode.orderDetailReport:
         routeObjName = 'saleReport'
         method = 'getSalesItemReport'
@@ -320,17 +429,17 @@ Page({
         }]
         content = [
           {
-            left: { tag: 'brandName',title:'skuName' ,type:'title'},
+            left: { tag: 'brandName', title: 'skuName', type: 'title' },
           },
           {
             left: { name: 'orgName' },
           },
           {
-            left: { name: 'priceSale',type:'price' },
-            right: { name: 'itemQty',type:'qty' }
+            left: { name: 'priceSale', type: 'price' },
+            right: { name: 'itemQty', type: 'qty' }
           },
           {
-            left: { name: 'pickupDate',title:'日期：' },
+            left: { name: 'pickupDate', title: '日期：' },
             right: { name: 'whName' },
           }]
         break;

utils/Constants.js

@@ -370,6 +370,10 @@ module.exports = {
    * @date   : 2024/3/27 10:07
    */
   menuCode: {
+    // 入库明细表
+    inboundDetailReport: 'entry-detail-report',
+    // 出库明细表
+    outboundDetailReport: 'out-detail-report',
     // 销售单明细表
     orderDetailReport: 'order-detail-report',
     // 采购明细表