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

package-accounts-manage/pages/accounting-verification/add/add.js

@@ -1,29 +1,55 @@
-// package-accounts-manage/pages/receipt/add/add.js
+const mixins = require('@/mixins/index.js')
 Page({
-
+  mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
+    cardList: [{name:'main'},{name:'main2'},{name:'items',title:'预付单据'},{name:'items2',title:'应付单据'},{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: 'staffId', name: 'staffName', type: 'drop', required: false, dropType: 'staff', title: '业务部门' },
+
+
+
+     
+
+      ],
+
+      main2:[
+        { code: 'staffId', name: 'staffName', type: 'drop', required: true, dropType: 'staff', title: '付款人' },
+        { code: 'staffId', name: 'staffName', type: 'drop', required: false, dropType: 'staff', title: '付款部门' },
+        { code: 'collectAmount', type: 'number', title: '本次付款', required: true },
+        { code: 'collectAmount', type: 'number', title: '付款优惠', required: false },
+        { code: 'staffId', name: 'staffName', type: 'drop', required: false, dropType: 'staff', title: '付款类型' },
+      ],
+      items:[{ code: 'remarks', type: 'textarea', title: '预付单号' },{ code: 'collectAmount', type: 'number', title: '核销金额', required: false },{ code: 'collectAmount', type: 'number', title: '核销总额', required: false }],
+      items2:[{ code: 'remarks', type: 'textarea', title: '应付单号' },{ code: 'collectAmount', type: 'number', title: '核销金额', required: false },{ code: 'collectAmount', type: 'number', title: '核销总额', required: false }],
+      file:[{ code: 'remarks', type: 'textarea', title: '备注' }, { code: 'file', type: 'uploader', title: '附件' }]
+    },
+  },
+  getData() {
 
   },
-  toCustomers(){
+
+  toCustomers() {
     wx.navigateTo({
-      url: '../../selecting-account/select-account',
+      url: '../../selecting-customers/selecting-customers',
     })
   },
 
-  openSingle(e){
+  openSingle(e) {
     let key = e.currentTarget.dataset.key
-    if(key === 'selecting-account'){
-      wx.navigateTo({
-        url: '../../select-account/select-account',
-      })
+    if (key === 'payment-type') {
+      // wx.navigateTo({
+      //   url: '../../document-list/document-list',
+      // })
     }
-
-    
   },
-  toDocumentList(){
+  toDocumentList() {
     wx.navigateTo({
       url: '../../document-list/document-list',
     })
@@ -35,52 +61,4 @@ Page({
 
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
 })

package-accounts-manage/pages/accounting-verification/add/add.wxml

@@ -1,144 +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">
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 
-    <van-field label-class="red-label" right-icon="arrow" value="{{ '预付冲应付' }}" input-align="right" label="业务类型" placeholder="选供应商" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
+<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 
+<dk-form-more-items id="{{formName}}" objCol="suppliersId" objLabel="供应商" objType="suppliers"  dateCol="accountDate" dateLabel="付款日期"   cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
+</dk-form-more-items>
 
-    <van-field label-class="red-label" value="{{ '恒洁厂家' }}" input-align="right" label="供应商" placeholder="选供应商" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
-
-
-    <van-field label-class="nomal-label" right-icon="arrow"  value="{{ '王暖暖' }}" input-align="right" label="业务员" placeholder="业务员" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
-
-    <van-field label-class="nomal-label" right-icon="arrow"  value="{{ '大东和谐店' }}" input-align="right" label="业务部门" placeholder="业务部门" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
-
-  </view>
-
-
-
-
-  <view class="dk-card-class" style="margin-top: 20rpx;">
-
-    <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>
-
-    <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>
-
-
-
-    <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="{{ 2000 }}" bind:triggerBindValue="changeSumAmount"></dk-number-input>
-
-      </view>
-    </van-cell>
-
-    <van-cell border="{{false}}">
-      <view slot="title" style="color: #95A8CB;">
-        付款优惠
-      </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="{{ 2 }}" bind:triggerBindValue="changeSumAmount"></dk-number-input>
-
-      </view>
-    </van-cell>
-
-
-    <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>
-
-  </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%;">共10单</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="nomal-label" value="{{ '100002225601' }}" input-align="right" label="预付单号" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
-
-    <van-field label-class="nomal-label" value="{{ '1000.00' }}" input-align="right" label="核销金额" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
-
-    <van-field label-class="nomal-label" value="{{ '3002.00' }}" input-align="right" label="核销总额" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
-
-
-      
-      <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;">
-    <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%;">共10单</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="nomal-label" value="{{ '100002225601' }}" input-align="right" label="应付单号" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
-
-    <van-field label-class="nomal-label" value="{{ '1000.00' }}" input-align="right" label="核销金额" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
-
-    <van-field label-class="nomal-label" value="{{ '3002.00' }}" input-align="right" label="核销总额" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
-
-
-      
-      <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="funds-transfer-add" totallength="{{2002}}" bind:submit="toClose" bind:allClean="toAdd" />

package-accounts-manage/pages/accounting-verification/add/add.wxss

@@ -1 +0,0 @@
-/* package-accounts-manage/pages/accounting-verification/add/add.wxss */

package-accounts-manage/pages/funds-transfer/add/add.js

@@ -1,29 +1,47 @@
-// package-accounts-manage/pages/receipt/add/add.js
+const mixins = require('@/mixins/index.js')
 Page({
-
+  mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
 
+    cardList: [{ name: 'main' }, { name: 'items', title: '资金转账' }, { name: 'file' }],
+    contentObj: {
+      main: [
+        { code: 'staffId', name: 'staffName', type: 'drop', required: true, dropType: 'staff', title: '业务员' },
+        { code: 'staffId', name: 'staffName', type: 'drop', required: false, dropType: 'staff', title: '业务部门' },
+
+      ],
+      items: [{ code: 'staffId', name: 'staffName', type: 'drop', required: true, dropType: 'staff', title: '转出账户' },
+      { code: 'staffId', name: 'staffName', type: 'drop', required: false, dropType: 'staff', title: '转入账户' }, { code: 'collectAmount', type: 'number', title: '转出金额', required: true }],
+      file: [{ code: 'remarks', type: 'textarea', title: '备注' }, { code: 'file', type: 'uploader', title: '附件' }]
+    },
+  },
+  getData() {
+    // let formData = JSON.parse(this.data.formData) 
+    // formData.objInfo = null
+    
+    // this.setData({
+    //   formData:JSON.stringify(formData)
+    // })
   },
-  toCustomers(){
+
+  toCustomers() {
     wx.navigateTo({
-      url: '../../selecting-account/select-account',
+      url: '../../selecting-customers/selecting-customers',
     })
   },
 
-  openSingle(e){
+  openSingle(e) {
     let key = e.currentTarget.dataset.key
-    if(key === 'selecting-account'){
-      wx.navigateTo({
-        url: '../../select-account/select-account',
-      })
+    if (key === 'payment-type') {
+      // wx.navigateTo({
+      //   url: '../../document-list/document-list',
+      // })
     }
-
-    
   },
-  toDocumentList(){
+  toDocumentList() {
     wx.navigateTo({
       url: '../../document-list/document-list',
     })
@@ -35,52 +53,4 @@ Page({
 
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
 })

package-accounts-manage/pages/funds-transfer/add/add.wxml

@@ -1,102 +1,13 @@
-<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">
 
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 
+<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 
+<dk-form-more-items id="{{formName}}"  dateCol="accountDate" dateLabel="付款日期"   cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
+</dk-form-more-items>
 
-   
-    <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>
-
-    <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%;">共10单</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="selecting-account" maxlength="25" type="text" value="{{ '' }}" label="转出账户" placeholder="请选择转出账户" autosize border="{{ false }}" right-icon="arrow" color="#95A8CB" catchtap="openSingle" readonly="{{true}}">
-    </van-field>
-
-    <van-field label-class="red-label" input-width="200rpx" input-align="right" data-key="selecting-account" 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="{{ 2002 }}" 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>
 
 
 <!-- 底部信息 -->

package-accounts-manage/pages/funds-transfer/add/add.wxss

@@ -1,27 +0,0 @@
-.corner-view {
-  position: absolute;
-  /* 扇形弧度 */
-  border-radius: 0 0 0 100rpx;
-  /* 左上弧度 */
-  border-top-left-radius: 10rpx;
-  /* 位置 */
-  top: 0;
-  right: 0;
-
-  width: 86rpx;
-  height: 78rpx;
-  background-color: #95A8CB;
-
-}
-
-.corner-view-text {
-  transform: rotate(40deg);
-  position: absolute;
-  top:16rpx;
-  right:4rpx;
-  /* 字体颜色 */
-  color: #d5e4ff;
-  font-size: 24rpx;
-  /* font-weight: 600; */
-  font-size: 24rpx;
-}

package-accounts-manage/pages/other-expenditure-orders/add/add.js

@@ -1,33 +1,41 @@
-// package-accounts-manage/pages/receipt/add/add.js
+const mixins = require('@/mixins/index.js')
 Page({
-
+  mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
+    cardList: [{name:'main'},{name:'items',title:'应付单据'},{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: '付款部门' },
+
+      ],
+      items:[{ code: 'staffId', name: 'staffName', type: 'drop', required: true, dropType: 'staff', title: '付入类别' },{ code: 'collectAmount', type: 'number', title: '付入金额', required: true }],
+      file:[{ code: 'remarks', type: 'textarea', title: '备注' }, { code: 'file', type: 'uploader', title: '附件' }]
+    },
+  },
+  getData() {
 
   },
-  toCustomers(){
+
+  toCustomers() {
     wx.navigateTo({
       url: '../../selecting-customers/selecting-customers',
     })
   },
 
-  openSingle(e){
+  openSingle(e) {
     let key = e.currentTarget.dataset.key
-    if(key === 'payment-type'){
+    if (key === 'payment-type') {
       // wx.navigateTo({
       //   url: '../../document-list/document-list',
       // })
     }
-
-    if(key='collection-category'){
-       wx.navigateTo({
-        url: '../../collection-category/collection-category',
-      })
-    }
   },
-  toDocumentList(){
+  toDocumentList() {
     wx.navigateTo({
       url: '../../document-list/document-list',
     })
@@ -39,52 +47,4 @@ Page({
 
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
 })

package-accounts-manage/pages/other-expenditure-orders/add/add.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="{{ form.customerName }}" 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="{{ 'GYS0000002' }}" input-align="right" label="供应商编码" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
+<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></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}}" objCol="suppliersId" objLabel="供应商" objType="suppliers"  dateCol="accountDate" dateLabel="付款日期"   cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" 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%;">共10单</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="collection-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="{{ 2002 }}" 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="other-expenditure-orders-add" totallength="{{2002}}" bind:submit="toClose" bind:allClean="toAdd" />

package-accounts-manage/pages/other-expenditure-orders/add/add.wxss

@@ -1,27 +0,0 @@
-.corner-view {
-  position: absolute;
-  /* 扇形弧度 */
-  border-radius: 0 0 0 100rpx;
-  /* 左上弧度 */
-  border-top-left-radius: 10rpx;
-  /* 位置 */
-  top: 0;
-  right: 0;
-
-  width: 86rpx;
-  height: 78rpx;
-  background-color: #95A8CB;
-
-}
-
-.corner-view-text {
-  transform: rotate(40deg);
-  position: absolute;
-  top:16rpx;
-  right:4rpx;
-  /* 字体颜色 */
-  color: #d5e4ff;
-  font-size: 24rpx;
-  /* font-weight: 600; */
-  font-size: 24rpx;
-}

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

@@ -1,33 +1,41 @@
-// package-accounts-manage/pages/receipt/add/add.js
+const mixins = require('@/mixins/index.js')
 Page({
-
+  mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
+    cardList: [{name:'main'},{name:'items',title:'应收'},{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: '收款部门' },
+        
+      ],
+      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: '附件' }]
+    },
+  },
+  getData() {
 
   },
-  toCustomers(){
+
+  toCustomers() {
     wx.navigateTo({
       url: '../../selecting-customers/selecting-customers',
     })
   },
 
-  openSingle(e){
+  openSingle(e) {
     let key = e.currentTarget.dataset.key
-    if(key === 'payment-type'){
+    if (key === 'payment-type') {
       // wx.navigateTo({
       //   url: '../../document-list/document-list',
       // })
     }
-
-    if(key='income-category'){
-       wx.navigateTo({
-        url: '../../income-category/income-category',
-      })
-    }
   },
-  toDocumentList(){
+  toDocumentList() {
     wx.navigateTo({
       url: '../../document-list/document-list',
     })
@@ -39,52 +47,4 @@ Page({
 
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
 })

package-accounts-manage/pages/other-receipt/add/add.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="{{ form.customerName }}" 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="{{ form.customerName }}" input-align="right" label="客户电话" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
+<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></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}}" objCol="customerId" objLabel="客户名称" objType="customer"  dateCol="accountDate" dateLabel="收款日期"   cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" 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%;">共10单</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="{{ 2002 }}" 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-add" totallength="{{2002}}" bind:submit="toClose" bind:allClean="toAdd" />

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

@@ -1,27 +0,0 @@
-.corner-view {
-  position: absolute;
-  /* 扇形弧度 */
-  border-radius: 0 0 0 100rpx;
-  /* 左上弧度 */
-  border-top-left-radius: 10rpx;
-  /* 位置 */
-  top: 0;
-  right: 0;
-
-  width: 86rpx;
-  height: 78rpx;
-  background-color: #95A8CB;
-
-}
-
-.corner-view-text {
-  transform: rotate(40deg);
-  position: absolute;
-  top:16rpx;
-  right:4rpx;
-  /* 字体颜色 */
-  color: #d5e4ff;
-  font-size: 24rpx;
-  /* font-weight: 600; */
-  font-size: 24rpx;
-}

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

@@ -1,27 +1,42 @@
-// package-accounts-manage/pages/receipt/add/add.js
+const mixins = require('@/mixins/index.js')
 Page({
-
+  mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
+    cardList: [{name:'main'},{name:'items',title:'应付单据'},{name:'file'}],
+    contentObj: {
+      main: [
+        { code: 'staffId', name: 'staffName', type: 'drop', required: true, dropType: 'staff', title: '付款人' },
+        { code: 'staffId', name: 'staffName', type: 'drop', required: false, dropType: 'staff', title: '付款部门' },
+        { code: 'collectAmount', type: 'number', title: '本次付款', required: true },
+        { code: 'collectAmount', type: 'number', title: '付款优惠', required: false },
+        { code: 'staffId', name: 'staffName', type: 'drop', required: true, dropType: 'staff', title: '付款类型' },
+      ],
+      items:[{ code: 'remarks', type: 'textarea', title: '单据单号' },{ code: 'collectAmount', type: 'number', title: '已核销金额', required: true },{ code: 'collectAmount', type: 'number', title: '未核销金额', required: true },{ code: 'collectAmount', type: 'number', title: '本次核销', required: true }],
+      file:[{ code: 'remarks', type: 'textarea', title: '备注' }, { code: 'file', type: 'uploader', title: '附件' }]
+    },
+  },
+  getData() {
 
   },
-  toCustomers(){
+
+  toCustomers() {
     wx.navigateTo({
-      url: '../../selecting-suppliers/selecting-suppliers',
+      url: '../../selecting-customers/selecting-customers',
     })
   },
 
-  openSingle(e){
+  openSingle(e) {
     let key = e.currentTarget.dataset.key
-    if(key === 'payment-type'){
+    if (key === 'payment-type') {
       // wx.navigateTo({
       //   url: '../../document-list/document-list',
       // })
     }
   },
-  toDocumentList(){
+  toDocumentList() {
     wx.navigateTo({
       url: '../../document-list/document-list',
     })
@@ -33,52 +48,4 @@ Page({
 
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
 })

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

@@ -1,130 +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="{{ form.customerName }}" 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="{{ form.customerName }}" input-align="right" label="应付总额" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
+<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 
-  </view> -->
+<dk-form-more-items id="{{formName}}" objCol="suppliersId" objLabel="供应商" objType="suppliers"  dateCol="accountDate" dateLabel="付款日期"   cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
+</dk-form-more-items>
 
-
-  <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>GYS00001</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.000.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;">
-
-    <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>
-
-    <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>
-
-
-
-    <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="{{ 2000 }}" bind:triggerBindValue="changeSumAmount"></dk-number-input>
-
-      </view>
-    </van-cell>
-
-    <van-cell border="{{false}}">
-      <view slot="title" style="color: #95A8CB;">
-        付款优惠
-      </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="{{ 2 }}" bind:triggerBindValue="changeSumAmount"></dk-number-input>
-
-      </view>
-    </van-cell>
-
-
-    <van-field label-class="red-label" input-width="200rpx" input-align="right" data-key="payment-type" maxlength="25" type="text" value="{{ '选源单付款' }}" label="付款类型" placeholder="请选择" autosize border="{{ false }}" right-icon="arrow" color="#95A8CB" catchtap="openSingle" readonly="{{true}}">
-    </van-field>
-
-  </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%;">共10单</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="nomal-label" value="{{ '100002225601' }}" input-align="right" label="单据单号" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
-
-    <van-field label-class="nomal-label" value="{{ '1000.00' }}" input-align="right" label="已核销金额" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
-
-    <van-field label-class="nomal-label" value="{{ '3002.00' }}" input-align="right" label="未核销金额" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </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="{{ 2002 }}" 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>
 
 
 <!-- 底部信息 -->

package-accounts-manage/pages/payment-order/add/add.wxss

@@ -1,27 +0,0 @@
-.corner-view {
-  position: absolute;
-  /* 扇形弧度 */
-  border-radius: 0 0 0 100rpx;
-  /* 左上弧度 */
-  border-top-left-radius: 10rpx;
-  /* 位置 */
-  top: 0;
-  right: 0;
-
-  width: 86rpx;
-  height: 78rpx;
-  background-color: #95A8CB;
-
-}
-
-.corner-view-text {
-  transform: rotate(40deg);
-  position: absolute;
-  top:16rpx;
-  right:4rpx;
-  /* 字体颜色 */
-  color: #d5e4ff;
-  font-size: 24rpx;
-  /* font-weight: 600; */
-  font-size: 24rpx;
-}

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

@@ -1,84 +1,51 @@
-// package-accounts-manage/pages/receipt/add/add.js
+const mixins = require('@/mixins/index.js')
 Page({
-
-    /**
-     * 页面的初始数据
-     */
-    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',
-        // })
-      }
-    },
-    toDocumentList(){
-      wx.navigateTo({
-        url: '../../document-list/document-list',
-      })
-    },
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    cardList: [{name:'main'},{name:'items',title:'应收'},{name:'file'}],
+    contentObj: {
+      main: [
+        { code: 'staffId', name: 'staffName', type: 'drop', required: true, dropType: 'staff', title: '收款人' },
+        { code: 'staffId', name: 'staffName', type: 'drop', required: false, dropType: 'staff', title: '收款部门' },
+        { code: 'collectAmount', type: 'number', title: '本次收款', required: true },
+        { code: 'collectAmount', type: 'number', title: '收款优惠', required: false },
+        { code: 'staffId', name: 'staffName', type: 'drop', required: true, dropType: 'staff', title: '收款类型' },
+      ],
+      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: '附件' }]
+    },
+  },
+  getData() {
+
+  },
+
+  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',
+      // })
     }
+  },
+  toDocumentList() {
+    wx.navigateTo({
+      url: '../../document-list/document-list',
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
 })

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

@@ -1,131 +1,13 @@
-<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="{{ form.customerName }}" input-align="right" label="客户名称" placeholder="选客户" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
 
-    <van-field label-class="nomal-label" value="{{ form.customerName }}" input-align="right" label="应收总额" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
 
-  </view> -->
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 
+<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 
-  <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;">
+<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>
 
-    <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;">
-
-    <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>
-
-    <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>
-
-
-
-    <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="{{ 2000 }}" bind:triggerBindValue="changeSumAmount"></dk-number-input>
-
-      </view>
-    </van-cell>
-
-    <van-cell border="{{false}}">
-      <view slot="title" style="color: #95A8CB;">
-        收款优惠
-      </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="{{ 2 }}" bind:triggerBindValue="changeSumAmount"></dk-number-input>
-
-      </view>
-    </van-cell>
-
-
-    <van-field label-class="red-label" input-width="200rpx" input-align="right" data-key="payment-type" maxlength="25" type="text" value="{{ '选源单收款' }}" label="收款类型" placeholder="请选择" autosize border="{{ false }}" right-icon="arrow" color="#95A8CB" catchtap="openSingle" readonly="{{true}}">
-    </van-field>
-
-  </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%;">共10单</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="nomal-label" value="{{ '100002225601' }}" input-align="right" label="单据单号" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
-
-    <van-field label-class="nomal-label" value="{{ '1000.00' }}" input-align="right" label="已核销金额" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </van-field>
-
-    <van-field label-class="nomal-label" value="{{ '3002.00' }}" input-align="right" label="未核销金额" placeholder="" data-type='name' autosize border="{{ false }}" bind:change="fieldChange">
-    </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="{{ 2002 }}" 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-add" totallength="{{2002}}" bind:submit="toClose" bind:allClean="toAdd" />

package-accounts-manage/pages/receipt/add/add.wxss

@@ -1,27 +0,0 @@
-.corner-view {
-  position: absolute;
-  /* 扇形弧度 */
-  border-radius: 0 0 0 100rpx;
-  /* 左上弧度 */
-  border-top-left-radius: 10rpx;
-  /* 位置 */
-  top: 0;
-  right: 0;
-
-  width: 86rpx;
-  height: 78rpx;
-  background-color: #95A8CB;
-
-}
-
-.corner-view-text {
-  transform: rotate(40deg);
-  position: absolute;
-  top:16rpx;
-  right:4rpx;
-  /* 字体颜色 */
-  color: #d5e4ff;
-  font-size: 24rpx;
-  /* font-weight: 600; */
-  font-size: 24rpx;
-}

package-purchase/pages/purchase-order/add/add.js

@@ -1,6 +1,6 @@
-// package5/pages/purchase-order/add/add.js
+const mixins = require('@/mixins/index.js')
 Page({
-
+  mixins: [mixins],
   /**
    * 页面的初始数据
    */
@@ -8,6 +8,9 @@ Page({
     activeNames: ['1'],
     orderType: 'add'
   },
+  getData(){
+
+  },
   /**
    * @desc : 折叠面板
    * @author : 于继渤