首付款单

api/pages/mac/receiptPayment.js

@@ -10,7 +10,7 @@
 module.exports = {
 	receiptPaymentService: {
 		// 前缀
-		prefix: 'mdm-server/mac/receiptPayment/',
+		prefix: 'mdm-server/mac/recPay/',
 	},
 
 	routeUrl: {

i18n/zh-CN.js

@@ -40,12 +40,17 @@ const button = {
 const mac = {
   paymentOrder: '付款单',
   receiptOrder: '收款单',
+  accDate: '账务日期',
   receiptDate: '收款日期',
   paymentDate: '付款日期',
   receiptInfo: '收款信息',
   paymentInfo: '付款信息',
+  rpNo:'单号',
   paymentOrderNo: '付款单号',
   receiptOrderNo: '收款单号',
+  sumAmtReceivableHandle:'核销应收',
+  sumAmtPayableHandle:'核销应付',
+
 }
 
 const ivt = {

package-accounts-manage/pages/payment-order/payment-order.js

@@ -1,5 +1,12 @@
+/*******************************************************************************
+ * Copyright(c) 2022 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：  付款单列表
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		姜永辉      2024-03-22    1.00		   	    
+ *******************************************************************************/
 const Constants = require('@/utils/Constants.js');
-const util = require('@/utils/util.js')
 const mixins = require('@/mixins/index.js')
 Page({
   mixins: [mixins],
@@ -8,175 +15,131 @@ Page({
    */
   data: {
     // 查询条件
-    searchContent: [{ code: 'createtime', title: '本月', defaultValue: 3, searchType: Constants.searchType.date },
-    { code: 'staff', title: '业务员', dropType: 'staff' },
-    { code: 'org', title: '业务部门', dropType: 'org' },
-    { code: 'choose', title: '筛选', searchType: Constants.searchType.pick }],
+    searchContent: [
+      { code: 'createtime', title: mixins.$t('pastThirthtyDays'),
+       defaultValue: 5, searchType: Constants.searchType.date },
+      { code: 'staff', title: mixins.$t('staffId'), dropType: 'staff' },
+      { code: 'org', title: mixins.$t('orgId'), dropType: 'org' },
+      { code: 'choose', title: mixins.$t('choose'), searchType: Constants.searchType.pick }],
     // 查询条件-筛选
-    pullMenuList: [{ code: 'purchaseStatus', pullType: 'mSelect', typeName: 'purchaseStatus' },
-    { code: 'contactName', dataType: '' },
-    { code: 'deliveryPhone', dataType: '' },
-    { code: 'addressFull', dataType: '' },
-    { code: 'makingTime', dataType: 'date' }, { code: 'deliveryTime', dataType: 'date' }],
+    pullMenuList: [       
+      {
+        code: 'rpNo', 
+      },
+      {
+        code: 'supplierCode',
+      },
+      {
+        code: 'supplierName',
+      },
+      {
+        code: 'accDate',
+        title: 'accDate',
+        dataType: 'date'
+      },
+
+      {
+        code: 'staffName',
+      },
+      {
+        code: 'orgName',
+      },
+    ],
     // 列表区（内容）
-    contentList: [{ name: 'orderNo', title: '付款单号' },
-    { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: '' },], title: '门店/业务员' },
-    { name: 'makingTime', title: '付款日期' }],
+    contentList: [
+      { name: 'rpNo', title: mixins.$t('paymentOrderNo') },
+      {
+        name: [{ name: 'orgName', title: '' },
+        { name: 'staffName', title: '' },],
+        title: mixins.$t('paymentInfo')
+      },
+      { name: 'sumAmtPayableHandle', title: mixins.$t('sumAmtPayableHandle') },
+    ],
     // 弹出按钮
-    buttonList: [{ name: 'follow', title: '采购作废' }, { name: 'followTask', title: '冲正重开' }, { name: 'purchase-return-repla-sup', title: '采购退货' },
-    { name: 'collection', title: '采购退货冲正' }, { name: 'merge', title: '打印票据' }],
-    totallength: 234999, //视图下方提醒数量
-    selectTotallength: 12,
+    buttonList: [
+      {
+        name: 'customerRefundList',
+        title: '客户退款',
+      },
+      {
+        name: 'customerRefundList',
+        title: '取消收款',
+      }, {
+        name: 'customerRefundList',
+        title: mixins.$t('ticketPirnt'),
+      }
+    ],
     selectlength: 5,
-    // 路由
-    routeObjName: 'payment-receipt',
-    tableData: [],
-    active: 0,
-    // statusItem: {
-    //   text: '沈阳大东部'
-    // },
-    // statusItem2: {
-    //   text: '张三三'
-    // },
-    // createTimeType: {
-    //   text: '本月',
-    //   value: 3
-    // },
-  },
-
-  getData(){
-    this.setData({
-      tableData: [
-        {
-          supplierName: '张先生',
-          displayStatus: '付款单',
-          makingTime: '2022-04-04',
-          orderNo: 'FQ202207061423001',
-          staffName:'王丽丽',
-          orgName:'佛山居然店',
-          sumAccount:2000,
-          collectStatus:'null',
-          backgroundColor: '#95A8CB',
-        },
-        {
-          supplierName: '张先生',
-          displayStatus: '预付款',
-          makingTime: '2022-04-04',
-          orderNo: 'FQ202207061423001',
-          staffName:'王丽丽',
-          orgName:'佛山居然店',
-          sumAccount:2000,
-          collectStatus:'null',
-          backgroundColor: '#95A8CB',
-        },
-        {
-          supplierName: '张先生',
-          displayStatus: '其他付款',
-          makingTime: '2022-04-04',
-          orderNo: 'FQ202207061423001',
-          staffName:'王丽丽',
-          orgName:'佛山居然店',
-          sumAccount:2000,
-          collectStatus:'null',
-          backgroundColor: '#95A8CB',
-        }
-      ]
-    })
-  },
 
-
-  //抽屉打开
-  openSearchPop() {
-    this.setData({
-      show: true,
-    })
-  },
-  onclik(e) {
-    this.setData({
-      showShare: true,
-    })
-  },
-
-  onCloseShare() {
-    this.setData({
-      showShare: false,
-    })
-  },
-  /**
- * @desc : 抽屉离焦关闭
- * @author : 于继渤
- * @date : 2022/5/27 12:16
- */
-  onClose() {
-    this.setData({
-      show: false
-    })
-    this.selectComponent("#pick").toggle(false) //取消选中样式
-  },
-
-  toAdd() {
-    wx.navigateTo({
-      url: './add/add',
-    })
-  },
-  toDetail() {
-    wx.navigateTo({
-      url: './detail/detail',
-    })
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
+    // 底部保存按钮
+    buttonFootList: [{
+      name: 'add',
+      title: mixins.$t('add'),
+    }],
+    contentnFootList: [
+      {
+        title:  mixins.$t('totalAmount'),
+        code: 'totalAmount',
+        content: 0,
+        type: 'number'
+      }, {
+        type: 'count',
+        code: 'count',
+        bill: 1,
+        quantity: 2
+      }
+    ],
+    btnFormData: null,
+    // 路由
+    routeObjName: 'receiptPayment',
+    // 主键Id
+    primaryKey: 'rpId',
   
   },
 
   /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
+  * @desc : 设置查询参数
+  * @date : 2024年3月8日
+  * @author : 姜永辉
+  */
+  setSearchParams(params) {
+    //收付款类型-收款的查询参数
+    params.rpType = Constants.rpType.payment
+    return params;
   },
 
-  /**
-   * 生命周期函数--监听页面显示
+  /** 
+   * @desc : 查询 单据
+   * @date : 2024年3月8日
+   * @author : 姜永辉
    */
-  onShow() {
-
+  getData(params) {
+    return this.excute(this.data.service, this.data.service.selectByCond, params);    
   },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
   /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
+     * @desc :   处理接口返回数据
+     * @date : 2024年3月8日
+     * @author : 姜永辉
+     */
+  handleSearchData(tableData) {
+    let temp = tableData
+    console.log("tableData", tableData);
+    temp.forEach(it => {
+      it.makeTime = it.makeTime.substring(0, 10)
+      // 不加这个字段不显示收款字样
+      it.collectStatus = ' '      
+    })
+    let sumAmount = 0 //总的 合计金额
+    let sumNumber = 0 // 单数
+    let sumQty = 0 //总的 合集数量
+    sumAmount = tableData.sum('sumAmtPay')
+    sumNumber = tableData.length
+    sumQty = tableData.sum('sumAmtPayableHandle')
+    this.setData({
+      tableData: temp,
+      sumAmount,
+      sumNumber,
+      sumQty
+    })
   },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
 })

package-accounts-manage/pages/payment-order/payment-order.wxml

@@ -1,22 +1,22 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
-<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<loading wx:if="{{loading}}"></loading>
 <van-sticky scroll-top="0">
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:searchForm="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','telephone'])}}">
+  <dk-dropdown-menu model:searchForm="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['supplierName','orderNo'])}}">
   </dk-dropdown-menu>
 </van-sticky>
 <!-- 暂无数据 -->
-<van-empty wx:if="{{tableData.length<=0}}" description="暂无数据" />
+<van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}" />
 <!-- 列表区 -->
-<dk-list list="{{tableData}}" titleCorner="" title="supplierName" status="displayStatus" content="{{contentList}}" collectCol="sumAccount" collectName="付款" contentObj="{{contentObj}}" contentCol="" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
+<dk-list list="{{tableData}}" title="supplierName" content="{{contentList}}" collectCol="sumAmtPay" collectName="付款" contentObj="{{contentObj}}" contentCol="" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
+
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 
-<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>
 
 <view style="height: 200rpx;"></view>
 
 
 
 <!-- 新建按钮 -->
-<dk-save-bottom purchasePriceFlag="{{false}}" flagTypeName="payment-order" selectTotallength="{{selectTotallength}}" selectlength="{{selectlength}}" totallength="{{totallength}}" bind:submit="toAdd" submitFlag="{{true}}" />
-
+<dk-save-bottom purchasePriceFlag="{{false}}" flagTypeName="payment-order" selectTotallength="{{selectTotallength}}" selectlength="{{selectlength}}" totallength="{{totallength}}" bind:submit="toAdd" submitFlag="{{true}}" />

package-accounts-manage/pages/receipt/receipt.js

@@ -1,3 +1,11 @@
+/*******************************************************************************
+ * Copyright(c) 2022 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：  收款单列表
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		姜永辉      2024-03-22    1.00		   	    
+ *******************************************************************************/
 const Constants = require('@/utils/Constants.js');
 const mixins = require('@/mixins/index.js')
 Page({
@@ -8,19 +16,15 @@ Page({
   data: {
     // 查询条件
     searchContent: [
-      { code: 'createtime', title: mixins.$t('pastThirthtyDays'), defaultValue: 5, searchType: Constants.searchType.date },
+      { code: 'createtime', title: mixins.$t('pastThirthtyDays'),
+       defaultValue: 5, searchType: Constants.searchType.date },
       { code: 'staff', title: mixins.$t('staffId'), dropType: 'staff' },
       { code: 'org', title: mixins.$t('orgId'), dropType: 'org' },
       { code: 'choose', title: mixins.$t('choose'), searchType: Constants.searchType.pick }],
     // 查询条件-筛选
-    pullMenuList: [
+    pullMenuList: [       
       {
-        code: 'rpType',
-        pullType: 'mSelect',
-        typeName: 'rpType'
-      },
-      {
-        code: 'orderNo',
+        code: 'rpNo', 
       },
       {
         code: 'cusName',
@@ -28,10 +32,9 @@ Page({
       {
         code: 'cusPhone',
       },
-
       {
-        code: 'receiptDate',
-        title: 'receiptDate',
+        code: 'accDate',
+        title: 'accDate',
         dataType: 'date'
       },
 
@@ -44,13 +47,14 @@ Page({
     ],
     // 列表区（内容）
     contentList: [
-      { name: 'rpNo', title: '收款单号' },
+      { name: 'rpNo', title: mixins.$t('receiptOrderNo') },
       {
         name: [{ name: 'orgName', title: '' },
         { name: 'staffName', title: '' },],
-        title: '收款信息'
+        title: mixins.$t('receiptInfo')
       },
-      { name: 'amtReceipt', title: '核销应收' },],
+      { name: 'sumAmtReceivableHandle', title: mixins.$t('sumAmtReceivableHandle') },
+    ],
     // 弹出按钮
     buttonList: [
       {
@@ -74,8 +78,8 @@ Page({
     }],
     contentnFootList: [
       {
-        title: '合集金额:',
-        code: 'amount',
+        title:  mixins.$t('totalAmount'),
+        code: 'totalAmount',
         content: 0,
         type: 'number'
       }, {
@@ -90,51 +94,7 @@ Page({
     routeObjName: 'receiptPayment',
     // 主键Id
     primaryKey: 'rpId',
-    // linshi临时数据
-    tableData: [
-      {
-        supplierName: '张先生',
-        displayStatus: '应收收款',
-        accDate: '2022-04-04',
-        rpNo: 'FQ202207061423001',
-        backgroundColor: '#95A8CB',
-        staffName: '王丽丽',
-        orgName: '佛山居然店',
-        amtReceipt: '900.00',
-        number1: '100.00',
-        sumAccount: 2000,
-        collectStatus: 'availableBalance',
-        collectStatusAmount: 1000,
-      },
-      {
-        supplierName: '张先生',
-        displayStatus: '应收收款',
-        accDate: '2022-04-04',
-        rpNo: 'FQ202207061423001',
-        backgroundColor: '#95A8CB',
-        staffName: '王丽丽',
-        orgName: '佛山居然店',
-        amtReceipt: '900',
-        number1: '100',
-        sumAccount: 2000,
-        collectStatus: 'availableBalance',
-        collectStatusAmount: 1000,
-      },
-      {
-        supplierName: '张先生',
-        displayStatus: '其他收款',
-        accDate: '2022-04-04',
-        rpNo: 'FQ202207061423001',
-        backgroundColor: '#95A8CB',
-        staffName: '王丽丽',
-        orgName: '佛山居然店',
-        amtReceipt: '900.00',
-        number1: '100.00',
-        sumAccount: 2000,
-        collectStatus: 'availableBalance',
-        collectStatusAmount: 1000,
-      }
-    ],
+  
   },
 
   /**
@@ -153,8 +113,8 @@ Page({
    * @date : 2024年3月8日
    * @author : 姜永辉
    */
-  getData() {
-    // return this.excute(this.data.service, this.data.service.selectByCond, params);    
+  getData(params) {
+    return this.excute(this.data.service, this.data.service.selectByCond, params);    
   },
   /**
      * @desc :   处理接口返回数据
@@ -166,17 +126,15 @@ Page({
     console.log("tableData", tableData);
     temp.forEach(it => {
       it.makeTime = it.makeTime.substring(0, 10)
-      // 入库对象
-      if (it.intoType == Constants.intoType.other) {
-        it.intoObject = it.cusName != null ? it.cusName : it.supplierName
-      }
+      // 不加这个字段不显示收款字样
+      it.collectStatus = ' '      
     })
     let sumAmount = 0 //总的 合计金额
     let sumNumber = 0 // 单数
     let sumQty = 0 //总的 合集数量
-    sumAmount = tableData.sum('intoingAmt')
+    sumAmount = tableData.sum('sumAmtRec')
     sumNumber = tableData.length
-    sumQty = tableData.sum('intoingQty')
+    sumQty = tableData.sum('sumAmtReceivableHandle')
     this.setData({
       tableData: temp,
       sumAmount,

package-accounts-manage/pages/receipt/receipt.wxml

@@ -3,13 +3,13 @@
 <loading wx:if="{{loading}}"></loading>
 <van-sticky scroll-top="0">
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:searchForm="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orderNo'])}}">
+  <dk-dropdown-menu model:searchForm="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['cusName','orderNo'])}}">
   </dk-dropdown-menu>
 </van-sticky> 
 <!-- 暂无数据 -->
 <van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}" />
 <!-- 列表区 -->
-<dk-list list="{{tableData}}" titleCorner="" title="supplierName" subTitle="accDate" status="displayStatus" content="{{contentList}}" collectCol="sumAccount" collectName="收款" contentObj="{{contentObj}}" contentCol="" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
+<dk-list list="{{tableData}}" title="cusName" subTitle="makeTime"   content="{{contentList}}" collectCol="sumAmtRec" collectName="收款" contentObj="{{contentObj}}" contentCol="" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle"  routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 

package-inventory/pages/warehousing-processing/warehousing-processing.js

@@ -182,7 +182,7 @@ Page({
     // 底部左侧合计金额及数量
     contentnFootList: [
       {
-        title: '合集金额:',
+        title:  mixins.$t('totalAmount'),
         code: 'intoingAmt',
         content: 0,
         type: 'number'