其他支出 其他收入 调通

api/pages/mac/transfer.js

@@ -10,7 +10,7 @@
 module.exports = {
 	transferService: {
 		// 前缀
-		prefix: 'mdm-server/mac/receiptPayment/',
+		prefix: 'mdm-server/mac/transfer/',
 	},
 	routeUrl: {
 		transfer: { 

components/dkbase/dk-form-more-items/dk-form-more-items.js

@@ -379,7 +379,7 @@ Component({
             bindData: function (data) {
               let dataitem = data.data.item
               let form = _this.data.form
-              let objIdCol = _this.data.objIdCol;
+              let objIdCol = _this.data.objIdCol; 
               // 赋值对象Id
               if (objIdCol && dataitem[objIdCol]) {
                 form[objIdCol] = dataitem[objIdCol]

package-accounts-manage/pages/fund-account/add/add.js

@@ -99,6 +99,7 @@ Page({
      */
     setParams(params) {
         params.roleIds = (params.roleIds && params.roleIds.length > 0) ? params.roleIds.split(',') : []
+        params.accDate=new Date().toDateStr()  
         return params
     },
 

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

@@ -5,7 +5,20 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+ // 弹出按钮
+ buttonList: [{
+  name: 'merge',
+  title: mixins.$t('collection')
+}],
+contentList: [{
+  code: 'need',
+  title: mixins.$t('totalAmount'),
+  type: 'str'
+}, {
+  code: 'amount',
+  content: 0,
+  type: 'number'
+}],
     cardList: [{
       name: 'main'
     }, {
@@ -74,38 +87,23 @@ Page({
      * @author : 王英杰
      * @date   : 2024/1/26 11:46
      */
-  // chooseData(e){
-  //   console.log("t",e,this.data.formData);
-  //   let formData = JSON.parse(this.data.formData)
-  //   let code = e.detail.code
-  //   let data = e.detail.data.data
-  //   if(code == "brandId"){ //商品品牌
-  //     formData.brandId = data.id
-  //     formData.brandName = data.name
-  //   }
-  //   if(code == "categoryId"){ //商品种类
-  //     formData.categoryId = data.id
-  //     formData.catName = data.name
-  //   }
-  //   if(code == "unitId"){ //计量单位
-  //     formData.unitId = data.id
-  //     formData.unitName = data.name
-  //   } 
-  //   if(code == "subUnitId"){ //补助计量单位
-  //     formData.subUnitId = data.id
-  //     formData.subUnitName = data.name
-  //   } 
-  //   if(code == "seriesId"){ //补助计量单位
-  //     formData.seriesId = data.id
-  //     formData.seriesName = data.name
-  //   } 
-  //   if(code == "whId"){ //补助计量单位
-  //     formData.whId = data.id
-  //     formData.whName = data.name
-  //   } 
-  //   this.setData({
-  //     formData: JSON.stringify(formData)
-  //   })
-  // },
+  chooseData(e){
+    console.log("t",e,this.data.formData);
+    let formData = JSON.parse(this.data.formData)
+    let code = e.detail.code
+    let data = e.detail.data.data
+    if (code == "staffId") { //员工
+      formData.staffId = data.id
+      formData.staffName = data.name
+    }
+    if (code == "orgId") { //部门
+      formData.orgId = data.id
+      formData.orgName = data.name
+    }
+  
+    this.setData({
+      formData: JSON.stringify(formData)
+    })
+  },
 
 })

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

@@ -10,5 +10,6 @@
 <view style="height: 220rpx;"></view>
 
 
-<!-- 底部信息 -->
-<dk-save-bottom flagTypeName="funds-transfer-add" totallength="{{2002}}" bind:submit="toClose" bind:allClean="toAdd" />
+ 
+<!-- 新建按钮 -->
+<dk-save-button   btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="save"></dk-save-button>

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

@@ -44,20 +44,28 @@ Page({
       }],
         // 列表区（内容）
         contentList: [
-          { name: 'purNo', title: '调整编号' },
+          { name: 'trfNo', title: '调整编号' },
           {
-            name: [{ name: 'contactName', title: '' },
-            { name: 'contactPhone', title: '' }], title: '转入账户'
+            name:  'trfInMacName', title: '转入账户'
           },
-          { name: 'returnAddress', title: '转账日期' },
+          { name: 'accDate', title: '转账日期' },
           {
             name: [{ name: 'orgName', title: '' },
             { name: 'staffName', title: '业务员 ' }], title: '责任信息'
           }],
               // 路由
      routeObjName: 'transfer',
+        // 主键Id 
+    primaryKey: 'payableId',
           tableData: [{  collectStatus: '11', collectAmount: 1000, }]
-  }
-
+  },
 
+ /** 
+   * @desc : 查询 入库单
+   * @date : 2024年3月8日
+   * @author : 王英杰
+   */
+  getData(params) {
+    return this.excute(this.data.service, this.data.service.selectByCond, params);    
+  }, 
 })

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

@@ -16,7 +16,7 @@
 <van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}"  />
 
 <!-- 列表区 -->
-<dk-list  bind:toDetail="toDetail"   list="{{tableData}}" flgPoint = "{{true}}" title="supName" collectCol = "collectAmount"  content="{{contentList}}"    ></dk-list>
+<dk-list  bind:toDetail="toDetail"   list="{{tableData}}" flgPoint = "{{true}}" title="makeStaffName" collectCol = "collectAmount"  content="{{contentList}}"    ></dk-list>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 <view style="height: 200rpx;"></view>

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

@@ -8,7 +8,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    table: Constants.tables.income,
+    table: Constants.tables.outlay,
     cardList: [{
         name: 'main'
       },
@@ -64,7 +64,7 @@ Page({
           required: true
         },
         {
-          code: 'amtReceivable',
+          code: 'amtPayable',
           type: 'number',
           title: mixins.$t('paymentAmount'),//''付款金额',
           required: true,
@@ -112,7 +112,7 @@ Page({
     btnFormData: null,
     routeObjName: 'otherPayable'
   },
-  /**
+   /**
   * @desc : 给表单赋值
   * @date : 2024/2/1 15:49
   * @author : 王英杰
@@ -123,20 +123,19 @@ Page({
   let cardList = this.data.cardList
   formData = data.data
   data.dataItem.forEach(element => {
-    element.dataId = element.receivableType
-    element.receivableTypeName = element.receivableTypeName
+    element.dataId = element.payableType
+    element.receivableTypeName = element.payableTypeName
   });
   formData.itemList = data.dataItem
-  formData.cusId = data.data.cusId
+  formData.supId = data.data.objectId
  
   let objInfo = {
-    cusId: data.data.objectId,
-    cusCode: data.data.cusCode,
-    cusName: data.data.cusName,
-    cusPhone: data.data.cusPhone, 
+    supId: data.data.objectId,
+    supCode: data.data.supCode,
+    supName: data.data.supName,  
   }
   formData.objInfo  = objInfo
-  formData.sumAmount  = data.data.sumAmtReceivable
+  formData.sumAmount  = data.data.sumAmtPayable
   this.setData({
     itemData: data,
     formData: JSON.stringify(formData),
@@ -195,8 +194,8 @@ Page({
     if (formData.itemList) {
       let itemNumber = 0
       formData.itemList.forEach(element => {
-        if (!isNaN(element.amtReceivable)) { //是数字才能加减
-          itemNumber = Number(itemNumber)+ Number(element.amtReceivable)
+        if (!isNaN(element.amtPayable)) { //是数字才能加减
+          itemNumber = Number(itemNumber)+ Number(element.amtPayable)
         }
       });
       cardList.forEach(element => {
@@ -247,8 +246,8 @@ Page({
     if (formData.itemList) {
       let itemNumber = 0
       formData.itemList.forEach(element => {
-        if (!isNaN(element.amtReceivable)) { //是数字才能加减
-          itemNumber = Number(itemNumber)+ Number(element.amtReceivable)
+        if (!isNaN(element.amtPayable)) { //是数字才能加减
+          itemNumber = Number(itemNumber)+ Number(element.amtPayable)
         }
       });
       cardList.forEach(element => {
@@ -302,17 +301,21 @@ Page({
     params.remarks = formData.remarks // 备注
     params.makeStaff = app.globalData.user.staffId // 制单人 
     let itemList = []
+    let itemNumber = 0
     formData.itemList.forEach(element => {
+      if (!isNaN(element.amtPayable)) { //是数字才能加减
+        itemNumber = Number(itemNumber)+ Number(element.amtPayable)
+      }
       let item = {}
-      item.receivableType = element.dataId //收入类别
-      item.amtReceivable = element.amtReceivable //收入金额  
+      item.payableType = element.dataId //收入类别
+      item.amtPayable = element.amtPayable //收入金额  
       itemList.push(item)
     });
-    params.itemList = formData.itemList //商品明细
-    console.log("setParams", params);
+    params.itemList = itemList //商品明细 
+    params.sumAmtPayable = itemNumber 
     return params
   },
-
+    
   /**
    * @desc : 保存数据服务
    * @date : 2024/2/1 15:49
@@ -347,7 +350,7 @@ Page({
         // 通过eventChannel向被打开页面传送数据 
         res.eventChannel.emit('params', {
           item: _this.data.formData,
-          formType: 7
+          formType: 9
         })
       }
     })

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

@@ -3,8 +3,9 @@
 
 <loading wx:if="{{loading}}"></loading>
 
-<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}"    objCol="supplierId" objLabel="{{$t['supName']}}" objType="supplier"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" table="{{table}}"bind:chooseData="chooseData" totalObj="{{totalObj}}" bind:changeItemNumberField ="changeItemNumberField" bind:changeNumber = "changeNumber" bind:delItem= "delItem">
-</dk-form-more-items>
+<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}"    objCol="supplierId" objIdCol = "supId" objLabel="{{$t['supName']}}" objType="supplier"  
+objTitle ="supName" objSubTitle="contactPhone" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" table="{{table}}"bind:chooseData="chooseData" totalObj="{{totalObj}}" bind:changeItemNumberField ="changeItemNumberField" bind:changeNumber = "changeNumber" bind:delItem= "delItem">
+</dk-form-more-items>     
 
 <view style="height: 220rpx;"></view>
 

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

@@ -1,90 +1,225 @@
-// package-accounts-manage/pages/receipt/add/add.js
+const mixins = require('@/mixins/index.js')
+const Constants = require('@/utils/Constants.js');
+const util = require('@/utils/util.js')
+const app = getApp();
 Page({
-
+  mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
-
-  },
-  toCustomers(){
-    wx.navigateTo({
-      url: '../../selecting-customers/selecting-customers',
-    })
+    table: Constants.tables.income,
+    cardList: [{
+        name: 'main'
+      },
+      {
+        name: 'items',
+        title: mixins.$t('meet'),//'应付',
+        chooseFlag: true,
+        addFlag: false,
+        chooseTitle:  mixins.$t('selectCategory'),//'选类别',
+        urlKey: 'selectIncomeCategory'
+      },
+      {
+        name: 'file'
+      }
+    ],
+    contentObj: {
+      main: [{
+          code: 'accDate',
+          name: 'accDate',
+          title:  mixins.$t('paymentDate'),//'收款日期',
+          type: 'date',
+          required: true,
+        },
+        {
+          code: 'staffId',
+          name: 'staffName',
+          required: true,
+          title:  mixins.$t('payer'),//''付款人',
+          type: 'choose',
+          urlKey: 'chooseStaff'
+        },
+        {
+          code: 'orgId',
+          name: 'orgName',
+          required: true,
+          type: 'choose',
+          urlKey: 'chooseOrg'
+        },
+        {
+          code: 'sumAmount',
+          type: 'number',
+          title: mixins.$t('thisPaymentgo'),//'本次付款',
+          required: true
+        },
+
+      ],
+      items: [{
+          code: 'receivableTypeName',
+          name: '',
+          type: 'str',
+          title: mixins.$t('expenditureCategory'),//'支出类别',
+          readonly: true,
+          required: true
+        },
+        {
+          code: 'amtPayable',
+          type: 'number',
+          title: mixins.$t('paymentAmount'),//''付款金额',
+          required: true,
+          control:'receivableTypeName'
+        },
+
+      ],
+      file: [{
+          code: 'remarks',
+          type: 'textarea',
+          title: mixins.$t('remarks'),//'备注'
+          required: true
+        },
+        {
+          code: 'file',
+          type: 'uploader',
+          title: mixins.$t('uploader'),//'附件'
+          required: true
+        }
+      ]
+    },
+    totalObj: {
+      items: [{
+          code: 'receivableWaive',
+          title: mixins.$t('totalPayable'),//'合计应付',
+        },
+        {
+          code: 'verificationAmount',
+          title: mixins.$t('verificationAmount'),//'核销金额',
+        },
+      ],
+    },
+    
+    contentList: [{
+      code: 'need',
+      title: mixins.$t('totalAmount'),
+      type: 'str'
+    }, {
+      code: 'amount',
+      content: 0,
+      type: 'number'
+    }],
+    btnFormData: null,
+    routeObjName: 'otherPayable'
   },
-
-  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',
+    /**
+     * @desc : 详细页面 （编辑）
+     * @date : 2024/2/1 15:49
+     * @author : 王英杰
+     */
+    toEdit(e) {
+      let formData = JSON.parse(this.data.formData)
+      let payableId = formData.payableId
+      let that = this
+      wx.navigateTo({
+          url: this.data.route.add.url,
+          events: {
+              // 回调后，在这里给页面赋值
+              bandData: function (e) { 
+              }
+          },
+          success: function (res) {
+              res.eventChannel.emit('params', {
+                  id: payableId,
+                  formMode: Constants.formMode.edit
+              })
+          }
       })
-    }
-  },
-  toDocumentList(){
-    wx.navigateTo({
-      url: '../../document-list/document-list',
-    })
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
   },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
   /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
+  * @desc : 给表单赋值
+  * @date : 2024/2/1 15:49
+  * @author : 王英杰
+  */
+ setValuesByEdit(data) {
+  console.log("setValuesByEdit", data);
+  let  formData = JSON.parse(this.data.formData)
+  let cardList = this.data.cardList
+  formData = data.data
+  data.dataItem.forEach(element => {
+    element.dataId = element.payableType
+    element.receivableTypeName = element.payableTypeName
+  });
+  formData.itemList = data.dataItem
+  formData.supId = data.data.objectId
+ 
+  let objInfo = {
+    supId: data.data.objectId,
+    supCode: data.data.supCode,
+    supName: data.data.supName,  
+  }
+  formData.objInfo  = objInfo
+  formData.sumAmount  = data.data.sumAmtPayable
+  this.setData({
+    itemData: data,
+    formData: JSON.stringify(formData),
+    cardList:cardList,
+  })
+  this.changeItemNumberField()
+  this.changeNumber()
+},
+  
+    /**
+   * @desc : form表单 上 number类型修改回调
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
    */
-  onPullDownRefresh() {
-
+  changeNumber() {
+    let formData = JSON.parse(this.data.formData)
+    let cardList = this.data.cardList
+    if (formData.itemList) { 
+      cardList.forEach(element => {
+        if (element.name == 'items') {
+          element.verificationAmount = formData.sumAmount
+        }
+      }); 
+  
+      this.setData({
+        cardList: cardList, 
+      })
+    }
   },
-
   /**
-   * 页面上拉触底事件的处理函数
+   * @desc : 明细里得 收入金额 输入完回调 计算出合计
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
    */
-  onReachBottom() {
-
+  changeItemNumberField() {
+    let formData = JSON.parse(this.data.formData)
+    let cardList = this.data.cardList
+    let contentList = this.data.contentList
+    if (formData.itemList) {
+      let itemNumber = 0
+      formData.itemList.forEach(element => {
+        if (!isNaN(element.amtPayable)) { //是数字才能加减
+          itemNumber = Number(itemNumber)+ Number(element.amtPayable)
+        }
+      });
+      cardList.forEach(element => {
+        if (element.name == 'items') {
+          element.receivableWaive = itemNumber
+        }
+      }); 
+      contentList.forEach(it => {
+        if (it.type == 'number') {
+          it.content = itemNumber
+        }
+      })
+      this.setData({
+        cardList: cardList,
+        contentList:contentList
+      })
+    }
   },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
+  
+  
+ 
 })

package-accounts-manage/pages/other-expenditure-orders/detail/detail.wxml

@@ -1,102 +1,20 @@
-<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="{{ 'GYS0000002' }}" 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> -->
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 
- 
+<loading wx:if="{{loading}}"></loading>
 
+<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}"    objCol="supplierId" objIdCol = "supId" objLabel="{{$t['supName']}}" objType="supplier"  
+objTitle ="supName" objSubTitle="contactPhone" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" table="{{table}}"bind:chooseData="chooseData" totalObj="{{totalObj}}" bind:changeItemNumberField ="changeItemNumberField" bind:changeNumber = "changeNumber" bind:delItem= "delItem" readonly = "{{true}}">
+</dk-form-more-items>     
 
-  <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-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="save"></dk-save-button>
 
-<!-- 底部信息 -->
-<dk-save-bottom flagTypeName="other-expenditure-orders-detail" totallength="{{100}}" bind:submit="toClose" bind:allClean="toAdd" />
+<!-- 底部编辑 以后要做 todo......... -->
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;"  >
+  <view bind:tap="toEdit" class="btn-add-class">
+    <van-icon name="edit" color="#FFFFFF" size="60rpx" />
+  </view>
+</view>

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

@@ -1 +1,9 @@
-/* package-accounts-manage/pages/other-expenditure-orders/detail/detail.wxss */
+.btn-add-class {
+    background: #8091A9;
+    border-radius: 50%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 20rpx;
+    box-shadow: 0px 17px 22px 0px #1B365D33;
+  }

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

@@ -93,7 +93,7 @@ Page({
     // 路由
     routeObjName: 'otherPayable',
     // 主键Id 
-    primaryKey: 'receivableId',
+    primaryKey: 'payableId',
    
   },
 

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

@@ -301,14 +301,20 @@ Page({
     params.annexPaths = formData.annexPaths || [] //附件 
     params.remarks = formData.remarks // 备注
     params.makeStaff = app.globalData.user.staffId // 制单人 
+
     let itemList = []
+    let itemNumber = 0
     formData.itemList.forEach(element => {
+      if (!isNaN(element.amtReceivable)) { //是数字才能加减
+        itemNumber = Number(itemNumber)+ Number(element.amtReceivable)
+      }
       let item = {}
       item.receivableType = element.dataId //收入类别
       item.amtReceivable = element.amtReceivable //收入金额  
       itemList.push(item)
     });
-    params.itemList = formData.itemList //商品明细
+    params.itemList = itemList //商品明细 
+    params.sumAmtReceivable = itemNumber
     console.log("setParams", params);
     return params
   },

package-base-select/pages/select-collection_confirm/select-collection_confirm.js

@@ -31,6 +31,7 @@ mixins: [mixins],
       moneyAccountService: app.globalData['moneyAccountService'], 
       otherReceivableService: app.globalData['otherReceivableService'], 
       orderService: app.globalData['orderService'], 
+      otherPayableService: app.globalData['otherPayableService'], 
     },
 
     /**
@@ -342,12 +343,17 @@ mixins: [mixins],
       params.annexPaths = formData.annexPaths || [] //附件 
       params.remarks = formData.remarks  // 备注
       params.makeStaff = app.globalData.user.staffId  // 制单人  
+      let itemNumber = 0 
       formData.itemList.forEach(element => {
+        if (!isNaN(element.amtReceivable)) { //是数字才能加减
+          itemNumber = Number(itemNumber)+ Number(element.amtReceivable)
+        }
         let item = {}
         item.receivableType = element.dataId //收入类别
         item.amtReceivable = element.receiptResidue //收入金额  
         itemList.push(item)
       }); 
+      params.sumAmtReceivable = itemNumber
     }
    else if (this.data.formType == 8) { //订单开单收款
      
@@ -367,6 +373,28 @@ mixins: [mixins],
     params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())
     params.receiptList = itemList
     console.log('params', params)
+   } else if (this.data.formType == 9) { //其他支出
+    let formData = JSON.parse(this.data.formData)
+    //收付款类型-收款的查询参数
+    params.objectType = '对象类型-供应商' 
+    params.objectId = formData.objInfo.supId
+    params.orgId = formData.orgId //组织部门
+    params.staffId = formData.staffId // 员工
+    params.accDate = formData.accDate
+    params.annexPaths = formData.annexPaths || [] //附件 
+    params.remarks = formData.remarks // 备注
+    params.makeStaff = app.globalData.user.staffId // 制单人  
+    let itemNumber = 0
+    formData.itemList.forEach(element => {
+      if (!isNaN(element.amtPayable)) { //是数字才能加减
+        itemNumber = Number(itemNumber)+ Number(element.amtPayable)
+      }
+      let item = {}
+      item.payableType = element.dataId //收入类别
+      item.amtPayable = element.amtPayable //收入金额  
+      itemList.push(item)
+    }); 
+    params.sumAmtPayable = itemNumber 
   }
      
       if(this.data.formType !== 8){
@@ -384,7 +412,7 @@ mixins: [mixins],
     */
     saveData() {
       //  根据formtype不同值  
-      // formType ：1 收款单 ，2 付款单， 3 客户收款  4 客户退款  5 退收款单 6 退付款单  7 其他收入单 8 订单开单收款 
+      // formType ：1 收款单 ，2 付款单， 3 客户收款  4 客户退款  5 退收款单 6 退付款单  7 其他收入单 8 订单开单收款  9 其他支出
       if (this.data.formType == 1) {
         return this.excute(this.data.service, this.data.service.insertReceivableReceipt, this.data.params)
       } else if (this.data.formType == 2) {
@@ -401,6 +429,8 @@ mixins: [mixins],
         return this.excute(this.data.otherReceivableService, this.data.otherReceivableService.insert, this.data.params)  
       }else if (this.data.formType == 8) {  
         return this.excute(this.data.orderService, this.data.orderService.insert, this.data.params); 
+      }else if (this.data.formType == 9) {  
+        return this.excute(this.data.otherPayableService, this.data.otherPayableService.insert, this.data.params); 
       }
 
 

utils/Constants.js

@@ -312,9 +312,9 @@ module.exports = {
     // 收付款单
     recPay: 't_mac_rec_pay',
     // 其他收入单
-    income: 't_mac_income',
+    income: 't_mac_other_receivable',
     // 其他支出单
-    outlay: 't_mac_outlay',
+    outlay: 't_mac_other_payable',
   },
 
   /**