Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

api/pages/mac/cusReceiptPayment.js

@@ -18,6 +18,7 @@ module.exports = {
 		cusReceiptPayment: {
 			// 收款单新建
 			add: { key: 'add', url: '/package-sales/pages/customer-collection/add/add' },
+			edit: { key: 'edit', url: '/package-sales/pages/customer-collection/detail/detail',idKey:'rpId' },
       selectCustomers: { key: 'add', url: '/package-base-select/pages/select-customers/select-customers' },
 
       selectCollectionConfirm:{key:'selectCollectionConfirm',url:'/package-base-select/pages/select-collection_confirm/select-collection_confirm'}

app.json

@@ -77,6 +77,7 @@
                 "pages/sales-outbound/detail/outbound-detail",
                 "pages/customer-collection/customer-collection",
                 "pages/customer-collection/add/add",
+                "pages/customer-collection/detail/detail",
                 "pages/customer-collection/refund/refund",
                 "pages/inventory/inventory"
             ]

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

@@ -71,7 +71,7 @@
       <!--联系电话-->
       <dk-number-phone-input wx:if="{{item.type=='phone' && !item.hide}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" labelClass="{{item.required?'red-label':'nomal-label' }}" clearable rightIcon="phone" model:value="{{ form[item.code]}}" bind:changeField="changePhone" bind:clear="clearField" bind:changeFieldblur="changePhoneblur" errorMessage="{{item.errMsg}}" id="{{item.code}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.code)}}"></dk-number-phone-input>
       <!--数字类-->
-      <dk-number-input wx:if="{{item.type=='number' && !item.hide}}" 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}}" center="left" 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:triggerBindValue="changeNumberField"></dk-number-input>
+      <dk-number-input wx:if="{{item.type=='number' && !item.hide}}" 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}}" center="left" 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'}}" readonly="{{!!item.readonly}}"  inputValue="{{form[item.code]}}" bind:triggerBindValue="changeNumberField"></dk-number-input>
 
       <!--备注-->
       <van-field wx:if="{{item.type=='textarea' && !item.hide}}" rows="{{item.rows}}" show-word-limit="{{item.showWordLimit}}" type="textarea" label-class="{{item.required?'red-label':'nomal-label' }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" 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 }}" readonly="{{!!item.readonly}}" input-class="dk-cell-value-class {{item.rows ?  'input-rows-class' : ''}}" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">

i18n/zh-CN.js

@@ -291,6 +291,9 @@ const customer = {
   storeInformation: '门店信息',
   nextFollowTime: '提醒时间',
   cusCollection: '客户收款',
+  cusReturnCollection: '客户退款',
+  cusReturnCollectionAmt: '退款金额',
+  cusNotCollection: '取消收款',
   saleOrder: '销售订单',
   potentialCus: '潜在客户',
   salePotentialCus: '销售状态-潜客',

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

@@ -20,7 +20,6 @@ Page({
   data: {
     cardList: [
       { name: 'main', title: mixins.$t("customerInformation") },
-
     ],
     contentObj: {
       main: [

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

@@ -82,6 +82,18 @@ Page({
     buttonSaveList: [{ code: 'add', title: mixins.$t("add") }],
     // 路由
     routeObjName: 'cusReceiptPayment',
+      // 弹出按钮
+      buttonList: [{
+        name: 'cusReturnCollection',
+        title: mixins.$t("cusReturnCollection")
+      }, {
+        name: 'saleOutBound',
+        title: mixins.$t("cusNotCollection"),
+      }, {
+        name: 'saleReturn',
+        title: mixins.$t("ticketPirnt")
+      }
+      ],
   },
 
 
@@ -103,6 +115,7 @@ Page({
     if (tableData && tableData.length > 0) {
       tableData.forEach(res => {
         res.collectStatus = 'cusCollection'
+        res.collectStatus = res.sumAmtRec
       })
     }
     this.setData({

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

@@ -8,7 +8,7 @@
 </van-sticky>
 
 <!-- 列表区 -->
-<dk-list list="{{tableData}}" flgSubFormatDate="{{true}}" titleCorner="channelName" title="cusName" status="rpTypeName" subTitle="makeTime" content="{{contentList}}" collectCol="collectStatus" contentObj="{{contentObj}}" contentCol="" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint"  collectName="收款"   routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
+<dk-list list="{{tableData}}" flgSubFormatDate="{{true}}" titleCorner="channelName" title="cusName" status="rpTypeName" subTitle="makeTime" content="{{contentList}}" collectCol="collectStatus" collectCol="sumAmtRec" contentObj="{{contentObj}}" contentCol="" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint"  collectName="收款"   routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
 <view style="height: 200rpx;"></view>
 
 

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

@@ -0,0 +1,53 @@
+const Constants = require('@/utils/Constants.js');
+import Dialog from '@/dist/dialog/dialog.js';
+const mixins = require('@/mixins/index.js')
+const app = getApp()
+Page({
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    routeObjName: 'cusReceiptPayment',
+    cardList: ['main'],
+    contentObj: {
+      main: [
+        { code: 'cusName', type: 'str', title: mixins.$t('cusName'),readonly: true, },
+        { code: 'cusPhone', type: 'str', title: mixins.$t('cusPhone'),readonly: true, },
+        { code: 'addressFull', type: 'textarea', title: mixins.$t('adddressFull'),readonly: true, },
+        { code: 'sumAmtRec', type: 'number', title: mixins.$t("amountCollected"), readonly: true },
+        // { code: 'sumAmtRec', type: 'number', title: mixins.$t("cusReturnCollection"), readonly: true },
+        { code: 'sourceOrder', type: 'str', title: mixins.$t("sourceOrder"), readonly: true },
+        { code: 'remarks', type: 'textarea', title: mixins.$t("remarks"), readonly: false },
+        { code: 'file', type: 'uploader', title: mixins.$t("uploader") }
+      ],
+    },
+
+
+  },
+  /**
+   * @desc : 给表单赋值
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  setValuesByEdit(data) {
+    console.log(data)
+    this.setData({
+      formData:JSON.stringify(data)
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  loadInit(options) {
+    if (this.data.item.rpType == '收付款类型-退收款') {
+      let contentObj = this.data.contentObj
+      contentObj.main[3].title =  mixins.$t("cusReturnCollectionAmt")
+      this.setData({
+        contentObj:contentObj
+      })
+    }
+  },
+
+  
+})

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

@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText":"收款详情"
+}

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

@@ -0,0 +1,2 @@
+<dk-form id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
+</dk-form>

package-sales/pages/customer-collection/detail/detail.wxss

@@ -0,0 +1 @@
+/* package-sales/pages/customer-collection/detail/detail.wxss */