其他收入

api/pages/mac/otherReceivable.js

@@ -16,10 +16,7 @@ module.exports = {
 	routeUrl: {
 		otherReceivable: {
 			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'
-			}, 
+			edit: { key: 'edit', url: '/package-accounts-manage/pages/other-receipt/detail/detail' }, 
 			chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },
 			chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-data/select-data',type:'org' }, 
 			selectIncomeCategory: {

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

@@ -55,6 +55,12 @@ Page({
       },
       { code: 'file', type: 'uploader', title: '附件' }]
     },
+    totalObj: { 
+      items: [ 
+        { code: 'receivableWaive',title: '合计应收',   },
+        { code: 'receivableWaive',title: '核销金额',   }, 
+      ], 
+    },
     // 弹出按钮
     buttonList: [{
       name: 'merge',

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

@@ -3,7 +3,7 @@
 
 <loading wx:if="{{loading}}"></loading>
 
-<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objCol="customerId" objLabel="客户名称" objType="customer"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" table="{{table}}"bind:chooseData="chooseData">
+<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objCol="customerId" objLabel="客户名称" objType="customer"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" table="{{table}}"bind:chooseData="chooseData" totalObj="{{totalObj}}">
 </dk-form-more-items>
 
 <view style="height: 220rpx;"></view>

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

@@ -1,90 +1,111 @@
-// package-accounts-manage/pages/receipt/add/add.js
-Page({
+const mixins = require('@/mixins/index.js')
+const Constants = require('@/utils/Constants.js');
+const util = require('@/utils/util.js')
 
+Page({
+  mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
-
-  },
-  toCustomers(){
-    wx.navigateTo({
-      url: '../../selecting-customers/selecting-customers',
-    })
-  },
-
-  openSingle(e){
-    let key = e.currentTarget.dataset.key
-    if(key === 'payment-type'){
-      // wx.navigateTo({
-      //   url: '../../document-list/document-list',
-      // })
-    }
-
-    if(key='income-category'){
-       wx.navigateTo({
-        url: '../../income-category/income-category',
-      })
-    }
-  },
-  toDocumentList(){
-    wx.navigateTo({
-      url: '../../document-list/document-list',
-    })
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
+    table: Constants.tables.income,
+    cardList: [
+      { name: 'main' },
+      { name: 'items', title: '应收', chooseFlag: true, addFlag:false, chooseTitle: '选类别', urlKey: 'selectIncomeCategory' },
+      { name: 'file' }],
+    contentObj: {
+      main: [
+        {
+          code: 'accDate',
+          name: 'accDate',
+          title:'收款日期',
+          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: 'sumAmount',
+          type: 'number',
+          title: '本次收款',
+          required: true
+        },
+
+      ],
+      items: [ 
+        { code: 'receivableWaive',name: 'receivableWaiveName', type: 'str', title: '收入类别', readonly: true,required: true  },
+        { code: 'receiptResidue',type: 'number', title: '收入金额',required: true  },
+      
+      ],
+      file: [{
+        code: 'remarks', type: 'textarea', title: '备注'
+      },
+      { code: 'file', type: 'uploader', title: '附件' }]
+    },
+   
+    contentList: [{
+      code: 'need',
+      title: mixins.$t('totalAmount'),
+      type: 'str'
+    }, {
+      code: 'amount',
+      content: 0,
+      type: 'number'
+    }],
+    btnFormData: null,
+    routeObjName: 'otherReceivable'
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
+ 
 
   /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
+  * @desc : 给表单赋值
+  * @date : 2024/2/1 15:49
+  * @author : 王英杰
+  */
+ setValuesByEdit(data) {
+  console.log("setValuesByEdit", data);
+  let objInfo = {
+    cusId: data.objectId,
+    cusCode: data.cusCode,
+    cusName: data.cusName,
+    cusPhone: data.cusPhone,
+    addressArea: data.addressArea,
+    addressName: data.addressName,
+    addressNo: data.addressNo,
   }
+  data.objInfo = objInfo
+
+  this.setData({
+    itemData: data,
+    formData: JSON.stringify(data),
+  })
+},
+ 
+ 
+ 
+ /**
+  * @desc : 保存数据服务-跳转收款页面
+  * @date : 2024/2/1 15:49
+  * @author : 王英杰
+  */
+ open(e) {
+  // 保存成功后 回调
+  wx.navigateBack({
+    data: 1
+  })
+}
 })

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

@@ -1,102 +1,12 @@
-<view class="dk-card-outer-class">
-  <view style="display: flex;font-size: 14px;padding: 10rpx;padding-top: 20rpx;padding-bottom: 20rpx;">
-    <view style="text-align: left;width: 50%;margin-left: 20rpx;color: #E4002B;">收款日期</view>
-    <view style="text-align: right;width: 50%;margin-right: 20rpx;color:#1B365D">2024-12-03</view>
-  </view>
-  <!-- 单据信息 -->
-  <view class="dk-card-class">
-    <van-field label-class="red-label" value="{{ '李先生' }}" input-align="right" label="客户名称" placeholder="选客户" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 
-    <van-field label-class="nomal-label" value="{{ '150 5665 2333' }}" input-align="right" label="客户电话" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
+<loading wx:if="{{loading}}"></loading>
 
-   
-    <van-field label-class="red-label" input-width="200rpx" input-align="right" data-key="product-brand" maxlength="25" type="text" value="{{ '王诺诺' }}" label="收款人" placeholder="请选择" autosize border="{{ false }}" right-icon="arrow" color="#95A8CB" catchtap="openSingle" readonly="{{true}}">
-    </van-field>
+<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objCol="customerId" objLabel="客户名称" objType="customer"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" table="{{table}}"bind:chooseData="chooseData">
+</dk-form-more-items>
 
-    <van-field label-class="nomal-label" input-width="200rpx" input-align="right" data-key="product-brand" maxlength="25" type="text" value="{{ '大东销售部' }}" label="收款部门" placeholder="请选择" autosize border="{{ false }}" right-icon="arrow" color="#95A8CB" catchtap="openSingle" readonly="{{true}}">
-    </van-field>
-
-
-
-
-  </view>
-
-
-  <!-- <view style="position: relative;border:solid 3rpx #606EB2;background: #FFFFFF;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);border-radius: 15rpx;padding: 5rpx;height: 140rpx;display: flex;align-items: center;justify-content: center;">
-
-    <view style="width: 70%;color:#1B365D;font-size: 14px;font-weight: 600;text-align: left;margin-left: 40rpx;">
-      <view>王暖暖</view>
-      <view>156 0965 6030</view>
-    </view>
-    <view style="width: 30%;color:#1B365D;font-size: 14px;font-weight: 600;text-align: right;margin-right: 120rpx;">
-      <view>应收总额</view>
-      <view style="padding-top: 10rpx;font-size: 20px;">2.002.00</view>
-      
-
-
-    </view>
-    <view class="corner-view" bind:tap="toCustomers">
-      <view class="corner-view-text">选客户</view>
-    </view>
-  </view> -->
-
- 
-
-
-  <view class="dk-card-class" style="margin-top: 20rpx;">
-    <view style="display: flex;font-size: 14px;padding: 20rpx;">
-
-      <view style="font-size:16px;color:#1B365D;font-weight: 600;width: 26%;">应收</view>
-      <view style="color:#95A8CB;font-size:12px;display: flex; align-items: flex-end;width: 59%;">共1单</view>
-      <view style="width: 15%;text-align: right;">
-      
-        <view style="height: 40rpx;border-radius: 6rpx;background-color:#9FAEE5;text-align: center;">
-              <text style=" font-size: 13px;color:  #FFFFFF;">收起</text>
-            </view>
-      </view>
-    </view>
-
-
-
-    <van-field label-class="red-label" input-width="200rpx" input-align="right" data-key="income-category" maxlength="25" type="text" value="{{ '运费' }}" label="收入类别" placeholder="请选择收入类别" autosize border="{{ false }}" right-icon="arrow" color="#95A8CB" catchtap="openSingle" readonly="{{true}}">
-    </van-field>
-
-    <van-cell border="{{false}}">
-      <view slot="title" style="color: #E4002B;">
-        收入金额
-      </view>
-      <view Cell Slot="value" style="float:left;margin-left:1vw;width:98%;">
-        <dk-number-input fontSize="14" center="right" data-key="priceSale" inputColor="#CAA977" inputValue="{{ 100 }}" bind:triggerBindValue="changeSumAmount"></dk-number-input>
-
-      </view>
-    </van-cell>
-      
-      <view style="margin:20rpx; border:solid 3rpx #606EB2;height:30px;border-radius: 6px;background-color:#F8F9FD;display: flex;justify-content: center;align-items: center;" bind:tap="toDocumentList">
-        <van-icon name="plus" color="#606EB2" size="40rpx"/> 
-      </view>
-  </view>
-
-
-  <view class="dk-card-class" style="margin-top: 20rpx;">
-  
-  <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ showPopupItem.remark }}" input-align="right" label="备注" placeholder="请输入备注" autosize border="{{ false }}" bind:change="changeCustomerFormField">
-  </van-field>
-
-
-
-  <view style="display:flex;width:100%;margin: 1vw;padding-top:20rpx;">
-      <view style="width: 30%; flex:1;color: #95A8CB;font-size: 28rpx;padding-left: 27rpx;">附件</view>
-      <view style="width: 70%;text-align: left;">
-        <van-uploader max-count="5" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ fileList }}" bind:delete="deleteImg" bind:after-read="afterRead" multiple="true" imageFit="aspectFit" />
-      </view>
-    </view>
-</view>
-<!-- 保留高度 -->
 <view style="height: 220rpx;"></view>
-</view>
-
 
-<!-- 底部信息 -->
-<dk-save-bottom flagTypeName="receipt-detail" totallength="{{2002}}" bind:submit="toClose" bind:allClean="toAdd" />
+<!-- 新建按钮 -->
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="open"></dk-save-button>