wangyingjie 2 gadi atpakaļ
vecāks
revīzija
422a3d6b72

+ 25 - 0
api/pages/mac/income.js

@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright(c) 2024 dongke All rights reserved. / Confidential
+ * 类的信息:
+ *		1.程序名称:
+ *		2.功能描述:其他收入单
+ * 编辑履历:
+ *		作者				日期					版本				修改内容
+ *		王英杰		  	    2024-1-19       		1.00		       	新建
+ *******************************************************************************/
+module.exports = {
+	incomeService: {
+		// 前缀
+		prefix: 'mdm-server/mac/account/',
+	},
+
+	routeUrl: {
+		income: {
+			add: { key: 'add', url: '/package-accounts-manage/pages/other-receipt/add/add' },
+			edit: { key: 'edit', url: '/package-accounts-manage/pages/other-receipt/add/add' },
+			detail: {
+				key: 'detail', url: '/package-accounts-manage/pages/other-receipt/detail/detail'
+			}, 
+		}
+	}
+}; 

+ 142 - 25
package-accounts-manage/pages/other-receipt/add/add.js

@@ -1,50 +1,167 @@
 const mixins = require('@/mixins/index.js')
+const Constants = require('@/utils/Constants.js');
+
 Page({
   mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
-    cardList: [{name:'main'},{name:'items',title:'应收'},{name:'file'}],
+    cardList: [
+      { name: 'main' },
+      { name: 'bill', title: '应收', chooseFlag: true, chooseTitle: '选应收', urlKey: 'selectBill' },
+      { name: 'file' }],
     contentObj: {
       main: [
-        { code: 'remarks', type: 'textarea', title: '客户电话' },
-        { code: 'staffId', name: 'staffName', type: 'drop', required: true, dropType: 'staff', title: '收款人' },
-        { code: 'staffId', name: 'staffName', type: 'drop', required: false, dropType: 'staff', title: '收款部门' },
-        
+        {
+          code: 'accDate',
+          name: 'accDate',
+          type: 'date',
+          required: true,
+        },
+        {
+          code: 'staffId',
+          name: 'staffName',
+          required: true,
+          title: '收款人',
+          type: 'choose',
+          urlKey: 'chooseStaff'
+        },
+        {
+          code: 'orgId',
+          name: 'orgName',
+          required: true,
+          type: 'choose',
+          urlKey: 'chooseOrg'
+        },
+        {
+          code: 'collectAmount',
+          type: 'number',
+          title: '本次收款',
+          required: true
+        },
+
+      ],
+      bill: [
+        { code: 'cancelAmount', type: 'cancel', title: '核销应收', bill: 3, amount: 500 },
+        { code: 'receivableWaive', type: 'number', title: '待核销金额', readonly: true, },
+        { code: 'receiptResidue', type: 'number', title: '使用预存', },
+        { code: 'sumWaiveAmt', type: 'number', title: '优惠金额', },
+        { code: 'currentReceivableWaive', type: 'number', title: '本次核销', required: true },
       ],
-      items:[{ code: 'collectType', name: 'collectName', type: 'drop', required: true, dropType: 'collect' },{ code: 'collectAmount', type: 'number', title: '收款金额', required: true }],
-      file:[{ code: 'remarks', type: 'textarea', title: '备注' }, { code: 'file', type: 'uploader', title: '附件' }]
+      file: [{
+        code: 'remarks', type: 'textarea', title: '备注'
+      },
+      { code: 'file', type: 'uploader', title: '附件' }]
     },
+    // 弹出按钮
+    buttonList: [{
+      name: 'merge',
+      title: mixins.$t('collection')
+    }],
+    contentList: [{
+      code: 'need',
+      title: mixins.$t('totalAmount'),
+      type: 'str'
+    }, {
+      code: 'amount',
+      content: 0,
+      type: 'number'
+    }],
+    btnFormData: null,
+    routeObjName: 'receiptPayment'
   },
-  getData() {
 
-  },
+  /**
+      * @desc   : 绑定数据-选择页面返回的逻辑处理
+      * @author : 姜永辉
+      * @date   : 2024年3月12日
+      */
+  chooseData(e) {
+    console.log("t", e, this.data.formData);
+    let formData = JSON.parse(this.data.formData)
+    let cardList_ = this.data.cardList
+    let code = e.detail.code
+    let data = e.detail.data.data
+    if (code == "supId") { //供应商
+      formData.supId = data.id
+      formData.supName = data.name
+    }
+    if (code == "staffId") { //员工
+      formData.staffId = data.id
+      formData.staffName = data.name
+    }
+    if (code == "orgId") { //部门
+      formData.orgId = data.id
+      formData.orgName = data.name
+    }
+
 
-  toCustomers() {
-    wx.navigateTo({
-      url: '../../selecting-customers/selecting-customers',
+    this.setData({
+      cardList: cardList_,
+      formData: JSON.stringify(formData)
     })
   },
 
-  openSingle(e) {
-    let key = e.currentTarget.dataset.key
-    if (key === 'payment-type') {
-      // wx.navigateTo({
-      //   url: '../../document-list/document-list',
-      // })
+
+
+  /**
+   * @desc : 保存数据服务--校验
+   * @date : 2024/2/1 15:49
+   * @author : 姜永辉
+   */
+  validData() {
+    let formData = JSON.parse(this.data.formData)
+    if (formData.goodsList == null || formData.goodsList.length == 0) {
+      wx.showToast({
+        title: mixins.$t("chooseGoodsInfo"),
+        icon: 'none'
+      })
+      return false
     }
+    return true
   },
-  toDocumentList() {
-    wx.navigateTo({
-      url: '../../document-list/document-list',
-    })
-  },
+
   /**
-   * 生命周期函数--监听页面加载
+   * @desc : 保存的參數設置
+   * @date : 2024/2/1 15:49
+   * @author : 姜永辉
    */
-  onLoad(options) {
+  setParams(params) {
+    let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
+    let formData = JSON.parse(this.data.formData)
+ 
+    //收付款类型-收款的查询参数
+    params.rpType = Constants.rpType.receipt
+    params.orgId = formData.orgId  //组织部门
+    params.staffId = formData.staffId  // 员工
+    //  // 供应商1 客户2 所有 传空
+    if (formData.objType == 1) {
+      params.supId = formData.outObject  // 供应商
+    }
+    if (formData.objType == 2) {
+      params.cusId = formData.outObject  // 客户
+    }
+    // params.whId = formData.whId  // 仓库
+    params.remarks = formData.remarks  // 备注
+    params.makeStaff = app.globalData.user.staffId  // 制单人
+    // 明细的顺序
+    let i = 0
+    formData.goodsList.forEach(it => {
+      it.itemIndex = (i++)
+    })
+    params.itemList = formData.goodsList //商品明细
+    console.log("setParams", params);
+    return params
+  },
 
+  /**
+  * @desc : 保存数据服务
+  * @date : 2024/2/1 15:49
+  * @author : 姜永辉
+  */
+  saveData() {
+    return this.excute(this.data.service, this.data.service.save, this.data.params)
   },
 
 })

+ 4 - 4
package-accounts-manage/pages/other-receipt/add/add.wxml

@@ -1,12 +1,12 @@
 <!-- 前台导入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>
 
-<dk-form-more-items id="{{formName}}" objCol="customerId" objLabel="客户名称" objType="customer"  dateCol="accountDate" dateLabel="收款日期"   cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
+<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objCol="customerId" objLabel="客户名称" objType="customer"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
 </dk-form-more-items>
 
 <view style="height: 220rpx;"></view>
 
-<!-- 底部信息 -->
-<dk-save-bottom flagTypeName="receipt-add" totallength="{{2002}}" bind:submit="toClose" bind:allClean="toAdd" />
+<!-- 新建按钮 -->
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="save"></dk-save-button>

+ 28 - 28
package-accounts-manage/pages/other-receipt/other-receipt.js

@@ -91,8 +91,8 @@ Page({
     ], 
     btnFormData: null,
     // 路由
-    routeObjName: 'receiptPayment',
-    // 主键Id
+    routeObjName: 'income',
+    // 主键Id 
     primaryKey: 'rpId',
     tableData: [
       {
@@ -158,35 +158,35 @@ Page({
   /** 
    * @desc : 查询 入库单
    * @date : 2024年3月8日
-   * @author : 姜永辉
+   * @author : 王英杰
    */
-  getData(params) {
-    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 :   处理接口返回数据
      * @date : 2024年3月8日
-     * @author : 姜永辉
+     * @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('sumAmtRec')
-    sumNumber = tableData.length
-    sumQty = tableData.sum('sumAmtReceivableHandle')
-    this.setData({
-      tableData: temp,
-      sumAmount,
-      sumNumber,
-      sumQty
-    })
-  },
+  // 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('sumAmtRec')
+  //   sumNumber = tableData.length
+  //   sumQty = tableData.sum('sumAmtReceivableHandle')
+  //   this.setData({
+  //     tableData: temp,
+  //     sumAmount,
+  //     sumNumber,
+  //     sumQty
+  //   })
+  // },
 })