组件数字负数标识

api/pages/mac/cusReceiptPayment.js

@@ -23,7 +23,10 @@ module.exports = {
 			cusReturnCollection: { key: 'cusReturnCollection', url: '/package-sales/pages/customer-collection/add/add',idKey:'rpId' ,formMode:'add',formType:'add'},
       selectCustomers: { key: 'add', url: '/package-base-select/pages/select-customers/select-customers' },
       refund:{ key: 'refund', url: '/package-sales/pages/customer-collection/refund/refund' }, 
-      selectCollectionConfirm:{key:'selectCollectionConfirm',url:'/package-base-select/pages/select-collection_confirm/select-collection_confirm'}
+      selectCollectionConfirm:{key:'selectCollectionConfirm',url:'/package-base-select/pages/select-collection_confirm/select-collection_confirm'},
+      chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },
+			staffadd: { key: 'staffadd', url: '/package-basic-data/pages/staff/add/add' },
+			chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-data/select-data',type:'org' }, 
 		}
 	}
 }; 

components/dkbase/dk-form-bill/dk-form-bill.wxml

@@ -186,7 +186,7 @@
             <van-icon wx:if="{{ form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
           </van-field>
           <!--数字类-->
-          <dk-number-input wx:if="{{item.type=='number'  && (item.show || item.show == undefined)}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" center="left" readonly="{{!!readonly || !!item.readonly}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#CAA977" titleFontWeight="{{item.required?'bold':'normal'}}" titleColor="{{item.required?'#E4002B':'#95A8CB'}}" inputValue="{{form[item.code]}}" bind:triggerBindBlur="changeNumberBlur" bind:triggerBindValue="changeNumberField"></dk-number-input>
+          <dk-number-input wx:if="{{item.type=='number'  && (item.show || item.show == undefined)}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" center="left" readonly="{{!!readonly || !!item.readonly}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#CAA977" titleFontWeight="{{item.required?'bold':'normal'}}" titleColor="{{item.required?'#E4002B':'#95A8CB'}}" inputValue="{{form[item.code]}}" negative="{{item.negative}}" maxFlag="{{item.maxFlag}}" bind:triggerBindBlur="changeNumberBlur" bind:triggerBindValue="changeNumberField"></dk-number-input>
 
           <!--备注-->
           <van-field wx:if="{{item.type=='textarea'  && (item.show || item.show == undefined)}}" type="textarea" label-class="{{item.required?'red-label':'nomal-label' }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" clearable readonly="{{!!readonly || !!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeField" bind:clear="clearField" errorMessage="{{item.errMsg}}">

i18n/zh-CN.js

@@ -50,7 +50,8 @@ const mac = {
   receiptOrderNo: '收款单号',
   sumAmtReceivableHandle:'核销应收',
   sumAmtPayableHandle:'核销应付',
-
+  thisRefund:'本次退款',
+  refund:'退款'
 }
 
 const ivt = {

package-sales/pages/customer-collection/refund/refund.js

@@ -1,66 +1,245 @@
-// package-sales/pages/customer-collection/refund/refund.js
+/*******************************************************************************
+ * Copyright(c) 2021 dongke All rights reserved. / Confidential
+ * 类的信息： 
+ *		1.程序名称：
+ *		2.功能描述：客户收款新建
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		于继渤		        2022-5-25		        1.00		   	    新建
+ *******************************************************************************/
+
+const Constants = require('@/utils/Constants.js');
+import Dialog from '@/dist/dialog/dialog.js';
+const mixins = require('@/mixins/index.js')
+const app = getApp()
 Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    cardList: [
+      { name: 'main' },
+    ],
+    contentObj: {
+      main: [
+        { code: 'receiptDate', name: 'receiptDate', type: 'date',required: true,},
+        {code: 'staffId', name: 'staffName', required: true,title: mixins.$t("staffId"), type: 'choose',  urlKey: 'chooseStaff'},
+        { code: 'orgId', name: 'orgName', required: true, type: 'choose',urlKey: 'chooseOrg'},
+        { code: 'sumAmtRec', type: 'number',negative:true,maxFlag:false, title: mixins.$t("thisRefund"), readonly: false },
+        { code: 'remarks', type: 'textarea', title: mixins.$t("remarks"), readonly: false },
+        { code: 'file', type: 'uploader', title: mixins.$t("uploader") }
+      ],
 
     },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
+    objInfo: {},
+    buttonSaveList: [{ code: 'add', title: mixins.$t("refund"), color: '#CAA977' }],
+    contentSaveList: [{ code: 'need', title: mixins.$t("cusReturnCollectionAmt"), type: 'str' }, { code: 'amount', content: 0, type: 'number' }],
+    routeObjName: 'cusReceiptPayment',
+    accountService: app.globalData['accountService'],
+  },
     /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
+  * @desc : 计算需收款
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
+  changeNumberBlur(e){
+    // let formData = JSON.parse(this.data.formData)
+    // let contentSaveList = this.data.contentSaveList
+    // contentSaveList[1].content = formData.sumAmtRec ? formData.sumAmtRec : 0
+   
+    // this.setData({
+    //   contentSaveList:contentSaveList
+    // })
+  },
+
+  /**
+  * @desc : 保存数据服务-跳转收款页面
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
+  open(e) {
+    let _this = this
+    wx.navigateTo({
+      url: this.data.route.selectCollectionConfirm.url,
+      events: {
+        // 回调后
+        bindData: function (data) {
+          // 保存成功后 回调
+          wx.navigateBack({
+            data: 1
+          })
+        }
+      },
+      success: function (res) {
+        //设置参数
+        let item = _this.setSaveData()
+        res.eventChannel.emit('params', { item: item, formType: 3 })
+      }
+    })
+  },
+
+  /**
+    * @desc : 处理保存参数
+    * @date : 2024/2/1 15:49
+    * @author : 于继渤
+    */
+  setSaveData() {
+    let formData = JSON.parse(this.data.formData)
+    let param = {}
+    param.cusName = formData.cusName
+    param.objInfo = {}
+    param.objInfo['cusPhone'] = formData.cusPhone
+    param.objInfo['cusName'] = formData.cusName
+    param.objInfo['objectId'] = formData.cusId
+    param.objInfo['addressFull'] = formData.addressFull
+    param.cusName = formData.cusName
+    param.cusPhone = formData.cusPhone
+    param.objectId = formData.cusId
+    param.addressFull = formData.addressFull
+    param.orgId = app.globalData.user.orgId
+    param.orgName = app.globalData.user.orgName
+    param.staffId = app.globalData.user.staffId
+    param.staffName = app.globalData.user.staffName
+    param.annexPaths = formData.annexPaths
+    if (this.data.item) {
+      param.rpType = '收付款类型-退款'
+      param.sumAmtRec = formData.receivableResidue
+    } else {
+      param.rpType = '收付款类型-收款'
+      param.sumAmtRec = formData.sumAmtRec
+      param.sumAmount = formData.sumAmtRec
+    }
+    return JSON.stringify(param)
+  },
+
+  /**
+    * @desc   : 选择回调
+    * @author : 于继渤
+    * @date   : 2024/1/26 11:46
+    */
+  chooseData(e) {
+    console.log('eee1', e);
+    let item = e.detail.data
+    let code = e.detail.code
+    let formData = JSON.parse(this.data.formData)
+    //设置客户信息
+    if (code == 'cusName') {
+      formData.cusCode = item.cusCode
+      formData.cusId = item.cusId
+      formData.cusName = item.cusName
+      formData.cusPhone = item.cusPhone
+      formData.cusFromName = item.cusFromName
+      formData.cusFrom = item.cusFrom
+      //处理地址
+      formData.address = {
+        address: item.addressFull,
+        addressFull: item.addressFull,
+        addressArea: item.addressArea,
+        addressGcj02: item.addressGcj02,
+        addressName: item.addressName,
+      }
+      formData.addressArea = item.addressArea
+      formData.addressFull = item.addressFull
+      formData.addressGcj02 = item.addressGcj02
+      formData.addressName = item.addressName
+      formData.addressNo = item.addressNo
+      //订单销售渠道 ,默认取的客户的渠道
+      formData.salesChannel = item.channelId
+      formData.channelId = item.channelId
+      formData.channelName = item.channelName
+      formData.contactPhone = item.contactPhone
+      formData.contactPhone = item.contactPhone
+    }
+    ///设置主从业务员
+    if (code == 'staff') {
+      formData.staff = item.staffItem
+      formData['staffId'] = item.staffMain.staffId
+      formData['staffName'] = item.staffMain.staffName
+      formData['staffList'] = item.staffList
+      console.log(item.staffList)
+    }
+    ///设置主从业务部门
+    if (code == 'org') {
+      console.log('item', item)
+      formData.org = item.orgItem
+      formData['orgId'] = item.orgMain.orgId
+      formData['orgName'] = item.orgMain.orgName
+      formData['orgList'] = item.orgList
+    }
+    this.setData({
+      formData: JSON.stringify(formData)
+    })
+
+  },
+
+
+
+
+  /**
+   * @desc : 加载数据
+   * @author : 于继渤
+   * @date : 2024/1/23 9:16
+   */
+  getRpInfoById(id, item) {
+    return this.excute(this.data.accountService, this.data.accountService.selectByCond, {
+      objectId: id
+    }).then(res => {
+      if (res.data.code == 200) {
+        //设置客户信息
+        let formData = JSON.parse(this.data.formData)
+        formData['receiptResidue'] = res.data.data.list[0].receiptResidue
+        //处理地址
+        formData.address = {
+          address: item.addressFull,
+          addressFull: item.addressFull,
+          addressArea: item.addressArea,
+          addressGcj02: item.addressGcj02,
+          addressName: item.addressName,
+        }
+        this.setData({
+          formData: JSON.stringify(formData)
+        })
+      }
+    });
+  },
+
+
+  /**
+  * 生命周期函数--监听页面加载
+  */
+  loadInit() {
+    let formData = JSON.parse(this.data.formData)
+
+    formData['staff'] = {
+      text: app.globalData.user.staffName,
+      value: [app.globalData.user.staffId]
+    }
+    formData['org'] = {
+      text: app.globalData.user.orgName,
+      value: [app.globalData.user.orgId]
     }
+    formData.orgId = app.globalData.user.orgId
+    formData.orgList = [
+      {
+        orgId: app.globalData.user.orgId,
+        orgName: app.globalData.user.orgName,
+        ownerFlag: true,
+        allocationRatio: 100,
+      }
+    ]
+    formData.staffId = app.globalData.user.staffId
+    formData.staffList = [
+      {
+        staffId: app.globalData.user.staffId,
+        staffName: app.globalData.user.staffName,
+        ownerFlag: true,
+        allocationRatio: 100,
+      }
+    ]
+    this.setData({
+      formData: JSON.stringify(formData)
+    })
+
+  },
 })

package-sales/pages/customer-collection/refund/refund.json

@@ -1,3 +1,4 @@
 {
-    "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText":"新建客户退款"
 }

package-sales/pages/customer-collection/refund/refund.wxml

@@ -1,2 +1,8 @@
-<!--package-sales/pages/customer-collection/refund/refund.wxml-->
-<text>package-sales/pages/customer-collection/refund/refund.wxml</text>
+
+<van-dialog id="van-dialog" />
+<loading wx:if="{{loading}}" ></loading>
+<dk-form-bill type="sale" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  saleStaffAndOrgFlag="{{false}}"
+objCol="customerId" objLabel="客户名称" amountTitle="客户欠款" chooseText="选客户" objType="customer" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}"  bind:customersChoose="customersChoose"   bind:changeNumberBlur="changeNumberBlur">
+</dk-form-bill>
+
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="open"></dk-save-button>