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

app.wxss

@@ -211,7 +211,15 @@ end
   background-size: 100% 46px;
 
 }
+.main-foot-1 {
+  background: #fff;
+  width: 100%;
+  border-radius: 15rpx 15rpx 0px  0px;
+  background: linear-gradient(180deg, #6A9DFB 0%, #FAFCFF 100%),#fff;
+  background-repeat: no-repeat;
+  background-size: 100% 46px;
 
+}
 .table {
   width: 94%;
   padding: 10px 3% 10px 3%;

components/dkbase/dk-save-bottom/dk-save-bottom.wxml

@@ -847,6 +847,30 @@
       </view>
     </view>
   </view>
+
+  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='receipt-detail'}}">
+
+<view style="width:40%;height:88rpx">
+  <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
+    合计金额：
+  </view>
+  <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
+</view>
+
+<!-- 保存确定区域 -->
+<view style="width: 60%; display: flex;">
+
+  <view style="border-radius: 15rpx;width: 26rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
+
+  </view>
+  <view style="width: 19rpx;"></view>
+
+  <view style="border-radius: 15rpx;width: 426rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
+    <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">关闭
+    </van-button>
+  </view>
+</view>
+</view>
 </view>
 
 

package-accounts-manage/pages/collection-category/collection-category.js

@@ -1,66 +1,104 @@
 // package-accounts-manage/pages/collection-category/collection-category.js
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.setData({
+      tableData: [
+        {
+          code: 'SR00001',
+          name: '运费',
+        },
+        {
+          code: 'SR00002',
+          name: '运费',
+          checked: true
+        },
+        {
+          code: 'SR00003',
+          name: '运费',
+        },
+     
+      ]
+    })
+  },
+  toAdd() {
+    this.setData({
+      showPopup: true
+    })
+  },
+  onClosePopup() {
+    this.setData({
+      showPopup: false
+    })
+  },
+  toDetail(e) {
+    let index = e.currentTarget.dataset.index
+    let tableData = this.data.tableData
+    tableData.forEach(res => {
+      res.checked = false
+    })
+    tableData[index].checked = true
+    this.setData({
+      tableData: tableData
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
 })

package-accounts-manage/pages/collection-category/collection-category.json

@@ -1,3 +1,4 @@
 {
-    "usingComponents": {}
+    "usingComponents": {},
+    "navigationBarTitleText":"支出类别"
 }

package-accounts-manage/pages/collection-category/collection-category.wxml

@@ -1,2 +1,154 @@
-<!--package-accounts-manage/pages/collection-category/collection-category.wxml-->
-<text>package-accounts-manage/pages/collection-category/collection-category.wxml</text>
+<van-sticky scroll-top="0">
+  <van-search model:value="{{ searchText }}" placeholder="输入资料名称/备注" use-action-slot bind:search="doSearch">
+  </van-search>
+
+
+
+</van-sticky>
+
+
+<view wx:for="{{tableData}}" data-item="{{item}}" wx:for-index="index" wx:key="index" class="main-class">
+  <view class="{{item.checked ? 'main-foot-1' : 'main-foot'}}" >
+    
+
+    <view class="table-content" bind:tap="toDetail" data-index="{{index}}" data-item="{{item}}">
+      <view class="table-content-row">
+        <view class="order-and-status">
+    
+          <!-- 供应商 -->
+          <view catchtap="toCustomer" data-item="{{item}}" style="width:calc(70% - 39rpx);display:flex;padding-left: 14rpx;font-size: 30rpx;">
+            <dk-text bind:tap="toCustomer" data-item="{{item}}" textDecoration="" fontSize="15px" value="{{ '支出类别'}}"></dk-text>
+          </view>
+        </view>
+      </view>
+
+
+ 
+      <view class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="支出编码" copyValue="{{item.code}}"></dk-text>
+          </view>
+          <view class="table-content-class" style="display: flex; width: 100%;justify-content: space-between;">
+            {{item.code}}
+          </view>
+        </view>
+      </view>
+
+
+     
+      <view class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="支出名称" copyValue="{{item.name}}"></dk-text>
+          </view>
+          <view class="table-content-class" style="display: flex; width: 100%;justify-content: space-between;">
+            {{item.name}}
+          </view>
+        </view>
+      </view>
+
+
+
+
+
+
+
+    </view>
+  </view>
+</view>
+<view style="height: 250rpx;"></view>
+<van-empty wx:if="{{tableData.length<=0}}" description="暂无数据" />
+
+<!--  保存 -->
+<!-- <view class="bottom-class-1">
+  <view class="bottom-class">
+    <van-button custom-class="save-button-class" loading="{{loading}}" bind:click="submit" type="default">确定
+    </van-button>
+  </view>
+
+</view> -->
+
+
+<!-- 弹窗 新建-->
+<van-popup show="{{showPopup}}" position="bottom" bind:close="onClosePopup" custom-class="function-pop-class">
+
+<view style="background-color:#F8F9FD;color:#1B365D;font-size: 17px;font-weight: 600;display: flex;justify-content: left;align-items: center;padding: 40rpx;">
+  <view>供应商</view>
+</view>
+
+<van-field input-width="200rpx" disabled="{{false}}" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ 'SR00001' }}" input-align="right" label="支出编码" placeholder="" autosize border="{{ false }}" bind:change="changeCustomerFormField">
+</van-field>
+<van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="red-label" data-key="addressNo" maxlength="50" value="{{ '配送费' }}" input-align="right" label="支出名称" placeholder="" autosize border="{{ false }}" bind:change="changeCustomerFormField">
+</van-field>
+
+
+
+<van-field disabled="{{false}}" input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" maxlength="50" value="" input-align="right" label="备注" placeholder="{{'请输入' + '备注'}}" autosize border="{{ false }}">
+</van-field>
+
+
+<view style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
+  <view style="width:48%">
+    <van-button size="large" plain round color="#1B365D" custom-style="height:88rpx;" bind:click="onClosePopup" type="default">取消
+    </van-button>
+  </view>
+  <view style="width: 4%;"></view>
+  <view style="width:48%;">
+    <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">保存
+    </van-button>
+  </view>
+</view>
+</van-popup>
+
+
+<!-- 底部加号 -->
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;">
+<view bind:tap="toAdd" style="background: #CAA977;border-radius: 50%;display: flex;justify-content: center;align-items: center;padding:20rpx;box-shadow: 0px 17px 22px 0px #1B365D33;">
+  <van-icon name="plus" color="#FFFFFF" size="60rpx" />
+</view>
+</view>
+
+
+
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>
+
+
+<van-popup show="{{showPick}}" position="right" bind:close="onClose" class="popup" custom-style="height:100%;width:80%">
+
+  <view class="pop-header">
+    <van-icon class="pop-header-x" catchtap="closeSearchPop" name="cross" />
+  </view>
+  <scroll-view scroll-y class="popup-scroll-view">
+    <van-cell-group customer-class="cell-group">
+
+      <van-field value="{{ searchForm.customerName }}" label-class="label-class" label="客户名称" data-title="customerName" placeholder="请输入客户名称" bind:change="onChange" />
+      <van-field value="{{ searchForm.customerCode }}" label-class="label-class" label="客户编码" data-title="customerCode" placeholder="请输入客户编码" bind:change="onChange" />
+    </van-cell-group>
+  </scroll-view>
+
+  <view style="height:120rpx;"></view>
+
+  <view class="popup-button">
+    <view class="popup-button-item">
+      <van-button type="default" size="large" custom-class="modal-button" catchtap="clearSearchForm">重置
+      </van-button>
+    </view>
+    <view class="popup-button-item">
+      <van-button type="danger" size="large" custom-class="modal-button" catchtap="doSearchData">确定</van-button>
+    </view>
+  </view>
+</van-popup>
+
+
+<!-- 业务部门 -->
+<dk-single-dropdown-item show="{{orgSourceFlag}}" docName="客户资料" contentID="{{form.orgId}}" id='org' typeName='org' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
+
+<!-- 业务员 -->
+<dk-single-dropdown-item show="{{staffSourceFlag}}" docName="客户资料" contentID="{{form.staff}}" id='staff' typeName='staff' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
+
+<!-- 渠道 -->
+<dk-single-dropdown-item show="{{channelSourceFlag}}" id='salesChannel' typeName='salesChannel' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
+
+<!-- 客户来源 -->
+<dk-single-dropdown-item show="{{customerSourceFlag}}" id='customerFrom' typeName='customerFrom' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>

package-accounts-manage/pages/income-category/income-category.js

@@ -1,66 +1,104 @@
-// package-accounts-manage/pages/income-category/income-category.js
+// package-accounts-manage/pages/collection-category/collection-category.js
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.setData({
+      tableData: [
+        {
+          code: 'SR00001',
+          name: '运费',
+        },
+        {
+          code: 'SR00002',
+          name: '运费',
+          checked: true
+        },
+        {
+          code: 'SR00003',
+          name: '运费',
+        },
+     
+      ]
+    })
+  },
+  toAdd() {
+    this.setData({
+      showPopup: true
+    })
+  },
+  onClosePopup() {
+    this.setData({
+      showPopup: false
+    })
+  },
+  toDetail(e) {
+    let index = e.currentTarget.dataset.index
+    let tableData = this.data.tableData
+    tableData.forEach(res => {
+      res.checked = false
+    })
+    tableData[index].checked = true
+    this.setData({
+      tableData: tableData
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
 })

package-accounts-manage/pages/income-category/income-category.wxml

@@ -1,2 +1,154 @@
-<!--package-accounts-manage/pages/income-category/income-category.wxml-->
-<text>package-accounts-manage/pages/income-category/income-category.wxml</text>
+<van-sticky scroll-top="0">
+  <van-search model:value="{{ searchText }}" placeholder="输入资料名称/备注" use-action-slot bind:search="doSearch">
+  </van-search>
+
+
+
+</van-sticky>
+
+
+<view wx:for="{{tableData}}" data-item="{{item}}" wx:for-index="index" wx:key="index" class="main-class">
+  <view class="{{item.checked ? 'main-foot-1' : 'main-foot'}}" >
+    
+
+    <view class="table-content" bind:tap="toDetail" data-index="{{index}}" data-item="{{item}}">
+      <view class="table-content-row">
+        <view class="order-and-status">
+    
+          <!-- 供应商 -->
+          <view catchtap="toCustomer" data-item="{{item}}" style="width:calc(70% - 39rpx);display:flex;padding-left: 14rpx;font-size: 30rpx;">
+            <dk-text bind:tap="toCustomer" data-item="{{item}}" textDecoration="" fontSize="15px" value="{{ '收入类别'}}"></dk-text>
+          </view>
+        </view>
+      </view>
+
+
+ 
+      <view class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="收入编码" copyValue="{{item.code}}"></dk-text>
+          </view>
+          <view class="table-content-class" style="display: flex; width: 100%;justify-content: space-between;">
+            {{item.code}}
+          </view>
+        </view>
+      </view>
+
+
+     
+      <view class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="收入名称" copyValue="{{item.name}}"></dk-text>
+          </view>
+          <view class="table-content-class" style="display: flex; width: 100%;justify-content: space-between;">
+            {{item.name}}
+          </view>
+        </view>
+      </view>
+
+
+
+
+
+
+
+    </view>
+  </view>
+</view>
+<view style="height: 250rpx;"></view>
+<van-empty wx:if="{{tableData.length<=0}}" description="暂无数据" />
+
+<!--  保存 -->
+<!-- <view class="bottom-class-1">
+  <view class="bottom-class">
+    <van-button custom-class="save-button-class" loading="{{loading}}" bind:click="submit" type="default">确定
+    </van-button>
+  </view>
+
+</view> -->
+
+
+<!-- 弹窗 新建-->
+<van-popup show="{{showPopup}}" position="bottom" bind:close="onClosePopup" custom-class="function-pop-class">
+
+<view style="background-color:#F8F9FD;color:#1B365D;font-size: 17px;font-weight: 600;display: flex;justify-content: left;align-items: center;padding: 40rpx;">
+  <view>供应商</view>
+</view>
+
+<van-field input-width="200rpx" disabled="{{false}}" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ 'SR00001' }}" input-align="right" label="收入编码" placeholder="" autosize border="{{ false }}" bind:change="changeCustomerFormField">
+</van-field>
+<van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="red-label" data-key="addressNo" maxlength="50" value="{{ '配送费' }}" input-align="right" label="收入名称" placeholder="" autosize border="{{ false }}" bind:change="changeCustomerFormField">
+</van-field>
+
+
+
+<van-field disabled="{{false}}" input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" maxlength="50" value="" input-align="right" label="备注" placeholder="{{'请输入' + '备注'}}" autosize border="{{ false }}">
+</van-field>
+
+
+<view style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
+  <view style="width:48%">
+    <van-button size="large" plain round color="#1B365D" custom-style="height:88rpx;" bind:click="onClosePopup" type="default">取消
+    </van-button>
+  </view>
+  <view style="width: 4%;"></view>
+  <view style="width:48%;">
+    <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">保存
+    </van-button>
+  </view>
+</view>
+</van-popup>
+
+
+<!-- 底部加号 -->
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;">
+<view bind:tap="toAdd" style="background: #CAA977;border-radius: 50%;display: flex;justify-content: center;align-items: center;padding:20rpx;box-shadow: 0px 17px 22px 0px #1B365D33;">
+  <van-icon name="plus" color="#FFFFFF" size="60rpx" />
+</view>
+</view>
+
+
+
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>
+
+
+<van-popup show="{{showPick}}" position="right" bind:close="onClose" class="popup" custom-style="height:100%;width:80%">
+
+  <view class="pop-header">
+    <van-icon class="pop-header-x" catchtap="closeSearchPop" name="cross" />
+  </view>
+  <scroll-view scroll-y class="popup-scroll-view">
+    <van-cell-group customer-class="cell-group">
+
+      <van-field value="{{ searchForm.customerName }}" label-class="label-class" label="客户名称" data-title="customerName" placeholder="请输入客户名称" bind:change="onChange" />
+      <van-field value="{{ searchForm.customerCode }}" label-class="label-class" label="客户编码" data-title="customerCode" placeholder="请输入客户编码" bind:change="onChange" />
+    </van-cell-group>
+  </scroll-view>
+
+  <view style="height:120rpx;"></view>
+
+  <view class="popup-button">
+    <view class="popup-button-item">
+      <van-button type="default" size="large" custom-class="modal-button" catchtap="clearSearchForm">重置
+      </van-button>
+    </view>
+    <view class="popup-button-item">
+      <van-button type="danger" size="large" custom-class="modal-button" catchtap="doSearchData">确定</van-button>
+    </view>
+  </view>
+</van-popup>
+
+
+<!-- 业务部门 -->
+<dk-single-dropdown-item show="{{orgSourceFlag}}" docName="客户资料" contentID="{{form.orgId}}" id='org' typeName='org' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
+
+<!-- 业务员 -->
+<dk-single-dropdown-item show="{{staffSourceFlag}}" docName="客户资料" contentID="{{form.staff}}" id='staff' typeName='staff' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
+
+<!-- 渠道 -->
+<dk-single-dropdown-item show="{{channelSourceFlag}}" id='salesChannel' typeName='salesChannel' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
+
+<!-- 客户来源 -->
+<dk-single-dropdown-item show="{{customerSourceFlag}}" id='customerFrom' typeName='customerFrom' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>

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

@@ -20,6 +20,12 @@ Page({
       //   url: '../../document-list/document-list',
       // })
     }
+
+    if(key='income-category'){
+       wx.navigateTo({
+        url: '../../income-category/income-category',
+      })
+    }
   },
   toDocumentList(){
     wx.navigateTo({

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

@@ -59,10 +59,9 @@
     </view>
 
 
-    <van-field label-class="red-label" value="{{ }}" input-align="right" label="收入类别" placeholder="请选择收入类别" data-type='name' autosize border="{{ false }}"  right-icon="arrow" bind:change="fieldChange">
-    </van-field>
 
-   
+    <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;">

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

@@ -1,66 +1,90 @@
-// package-accounts-manage/pages/other-receipt/detail/detail.js
+// package-accounts-manage/pages/receipt/add/add.js
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
+  /**
+   * 页面的初始数据
+   */
+  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',
+      // })
+    }
 
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
+    if(key='income-category'){
+       wx.navigateTo({
+        url: '../../income-category/income-category',
+      })
+    }
+  },
+  toDocumentList(){
+    wx.navigateTo({
+      url: '../../document-list/document-list',
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
 
-    },
+  },
 
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
 
-    },
+  },
 
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
 
-    },
+  },
 
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
 
-    },
+  },
 
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
 
-    },
+  },
 
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
 
-    },
+  },
 
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
 
-    },
+  },
 
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
 
-    }
+  }
 })

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

@@ -1,3 +1,4 @@
 {
-    "usingComponents": {}
+    "usingComponents": {},
+    "navigationBarTitleText":"其他收款单详情"
 }

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

@@ -1,2 +1,102 @@
-<!--package-accounts-manage/pages/other-receipt/detail/detail.wxml-->
-<text>package-accounts-manage/pages/other-receipt/detail/detail.wxml</text>
+<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>
+
+    <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>
+
+   
+    <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%;">共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" />