Prechádzať zdrojové kódy

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

姜永辉 1 rok pred
rodič
commit
4c86e7aae8

+ 80 - 55
package-basic-data/pages/customer-list/detail/detail.js

@@ -62,8 +62,7 @@ Page({
       this.setData({
         orderOutList: orderOutList
       })
-    }
-    else if (type == 'order') {
+    } else if (type == 'order') {
       // 销售訂單
       let orderList = this.data.orderList;
       orderList[index].showOrderDetailFlag = !orderList[index].showOrderDetailFlag
@@ -73,10 +72,10 @@ Page({
     }
   },
   /**
-  * @desc   : 打电话
-  * @author : 周兴
-  * @date   : 2024/2/19 11:46
-  */
+   * @desc   : 打电话
+   * @author : 周兴
+   * @date   : 2024/2/19 11:46
+   */
   openTelPhone(e) {
     let item = e.currentTarget.dataset.item;
     wx.makePhoneCall({
@@ -84,10 +83,10 @@ Page({
     })
   },
   /**
-     * @desc   : 显示tip
-     * @author : 周兴
-     * @date   : 2024/4/25 11:46
-     */
+   * @desc   : 显示tip
+   * @author : 周兴
+   * @date   : 2024/4/25 11:46
+   */
   showTip(e) {
     let tip = e.currentTarget.dataset.tip
     if (tip) {
@@ -95,10 +94,10 @@ Page({
     }
   },
   /**
-* @desc : 关闭所有的tip
-* @date : 2024/5/24 15:49
-* @author : 王英杰
-*/
+   * @desc : 关闭所有的tip
+   * @date : 2024/5/24 15:49
+   * @author : 王英杰
+   */
   handleTap() {
     if (this.selectComponent('#dk-tip1')) {
       this.selectComponent('#dk-tip1').setShowTipFlag(false)
@@ -131,7 +130,9 @@ Page({
     this.setData({
       loading: true
     })
-    return this.excute(this.data.cusFollowService, this.data.cusFollowService.selectCusFollow, { cusId: cusId }).then(res => {
+    return this.excute(this.data.cusFollowService, this.data.cusFollowService.selectCusFollow, {
+      cusId: cusId
+    }).then(res => {
       if (res.data.code == 200) {
         this.setData({
           loading: false
@@ -172,9 +173,9 @@ Page({
   },
 
   /**
-  * 把创建时间相同的跟进记录放入到一个item 然后扔到list
-  * @param {*} arr 
-  */
+   * 把创建时间相同的跟进记录放入到一个item 然后扔到list
+   * @param {*} arr 
+   */
   classify(arr) {
     let map = {};
     let myArr = [];
@@ -204,6 +205,17 @@ Page({
    */
   setValuesByEdit(data) {
     data.name = 'edit'
+    if (!this.data.freeVersionFlag) { //专业版
+      // 欠款 = 出库中 - 收款总额 - 期初
+      let outboundAmount = data.outboundAmount || 0 //出库中
+      let receiptResidue = data.receiptResidue || 0 //收款总额
+      let receiptLock = data.receiptLock || 0 //总收款锁定金额
+      let startAmount = data.startAmount || 0 //期初
+      let showreceiptResidue = receiptResidue + receiptLock
+      data.showreceiptResidue = showreceiptResidue
+      data.cusArrears = outboundAmount - showreceiptResidue - startAmount
+    }
+
     this.setData({
       item: data,
     })
@@ -213,10 +225,10 @@ Page({
     }
   },
   /**
-  * @desc : 切换tab
-  * @date : 2024/5/24 15:49
-  * @author : 周兴
-  */
+   * @desc : 切换tab
+   * @date : 2024/5/24 15:49
+   * @author : 周兴
+   */
   onChange(e) {
     //体验跳转显示假数据
     if (this.data.params && this.data.params.testFlag) {
@@ -226,8 +238,7 @@ Page({
       let cusId = this.data.id ? this.data.id : this.data.item.cusId
       if (name == 'follow') {
         this.getCusFollowList(cusId)
-      }
-      else if (name == 'deal') {
+      } else if (name == 'deal') {
         // // 标准版查销售出库
         // if (this.data.gradeCode == Constants.gradeCode.STD) {
         //   this.getOrderOut(cusId, Constants.outType.sale)
@@ -247,10 +258,10 @@ Page({
     }
   },
   /**
-  * @desc : 交易记录切换
-  * @date : 2024/2/1 15:49
-  * @author : 于继渤
-  */
+   * @desc : 交易记录切换
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   changeTag(e) {
     //体验跳转显示假数据
     if (this.data.params && this.data.params.testFlag) {
@@ -263,11 +274,9 @@ Page({
       })
       if (name == 'order') {
         this.getOrderList(data.cusId)
-      }
-      else if (name == 'order-out') {
+      } else if (name == 'order-out') {
         this.getOrderOut(data.cusId, Constants.outType.sale)
-      }
-      else if (name == 'order-return') {
+      } else if (name == 'order-return') {
         this.getOrderOut(data.cusId, Constants.outType.intoReturn)
       }
     }
@@ -363,10 +372,10 @@ Page({
     })
   },
   /**
-* @desc : 查询订单退货
-* @date : 2024/2/1 15:49
-* @author : 于继渤
-*/
+   * @desc : 查询订单退货
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   getOrderOutReturn(cusId) {
 
   },
@@ -392,15 +401,13 @@ Page({
         //   url = this.data.route.toSaleOrder.url
         // }
         url = this.data.route.toSaleOrder.url
-      }
-      else if (key == 'receipt') {
+      } else if (key == 'receipt') {
         if (gradeCode == Constants.gradeCode.STD) { //标准
           url = this.data.route.collection.url
         } else if (gradeCode == Constants.gradeCode.PRO) {
           url = this.data.route.toReceipt.url
         }
-      }
-      else if (key == 'saleReturn') {
+      } else if (key == 'saleReturn') {
         url = this.data.route.toSaleOrderReturn.url
       }
       let that = this
@@ -408,11 +415,15 @@ Page({
         url: url,
         events: {
           // 保存成功后刷新页面
-          refresh: function (data) {
-          }
+          refresh: function (data) {}
         },
         success: function (res) {
-          res.eventChannel.emit('params', { id: that.data.item.cusId, item: that.data.item, formType: Constants.formMode.add, formMode: Constants.formMode.add });
+          res.eventChannel.emit('params', {
+            id: that.data.item.cusId,
+            item: that.data.item,
+            formType: Constants.formMode.add,
+            formMode: Constants.formMode.add
+          });
         }
       })
     }
@@ -495,17 +506,21 @@ Page({
         },
         success: function (res) {
           // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的,实际中,需要从route中读取
-          res.eventChannel.emit('params', { id: item.rpId, formMode: Constants.formMode.other, formReturnMode: 'customer' })
+          res.eventChannel.emit('params', {
+            id: item.rpId,
+            formMode: Constants.formMode.other,
+            formReturnMode: 'customer'
+          })
         }
       })
     }
   },
 
   /**
-     * @desc : 跳转查看销售订单源单
-     * @date : 2024/2/1 15:49
-     * @author : 于继渤
-     */
+   * @desc : 跳转查看销售订单源单
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   toOrderDetail(e) {
     //体验跳转显示假数据
     if (this.data.params && this.data.params.testFlag) {
@@ -527,7 +542,12 @@ Page({
         },
         success: function (res) {
           // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的,实际中,需要从route中读取
-          res.eventChannel.emit('params', { id: item.orderId, item: item, formMode: Constants.formMode.other, formReturnMode: 'customer' })
+          res.eventChannel.emit('params', {
+            id: item.orderId,
+            item: item,
+            formMode: Constants.formMode.other,
+            formReturnMode: 'customer'
+          })
         }
       })
     }
@@ -583,7 +603,12 @@ Page({
       },
       success: function (res) {
         // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的,实际中,需要从route中读取
-        res.eventChannel.emit('params', { id: item.outId, formMode: Constants.formMode.detail, formType: Constants.formMode.detail, formReturnMode: 'customer' })
+        res.eventChannel.emit('params', {
+          id: item.outId,
+          formMode: Constants.formMode.detail,
+          formType: Constants.formMode.detail,
+          formReturnMode: 'customer'
+        })
       }
     })
   },
@@ -688,10 +713,10 @@ Page({
   },
 
   /**
-* @desc : 功能包购买浮钮
-* @date : 2024/7/10 8:49
-* @author : 常皓宁
-*/
+   * @desc : 功能包购买浮钮
+   * @date : 2024/7/10 8:49
+   * @author : 常皓宁
+   */
   toBuy() {
     //home的功能包修改此处就需要做相应修改 包括后面的传值
     let funPackage = app.globalData.company.funPackage ? [...app.globalData.company.funPackage] : []
@@ -734,7 +759,7 @@ Page({
     console.log(params);
     let service = app.globalData['companyService']
     return this.excute(service, service.saveFunc, params).then(res => {
-      if (res.data.code == Constants.SUCESS_CODE  && Number(this.data.params.factAmt) > 0) {
+      if (res.data.code == Constants.SUCESS_CODE && Number(this.data.params.factAmt) > 0) {
         // 成功后跳转支付
         this.toPay(res.data.data);
       }

+ 16 - 6
package-basic-data/pages/customer-list/detail/detail.wxml

@@ -50,8 +50,8 @@
           <view class="oreder-summary-detail">
             <text style="margin-right: 4px;"> 订单({{item.orderQuantity}}单)</text>
             <dk-tip id="dk-tip1" Down="{{true}}" Right="{{true}}" tipContent='数据来源:销售订单' bind:clickTip="handleTap"></dk-tip>
-          </view> 
-          
+          </view>
+
         </view>
         <view class="number" style="margin-right: 0;">
           <view class="order-summary">
@@ -128,7 +128,7 @@
       <view style="display: flex;">
         <view class="number">
           <view class="order-summary">
-            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.receiptResidue ? item.receiptResidue : 0}}"></dk-cell>
+            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.showreceiptResidue ? item.showreceiptResidue : 0}}"></dk-cell>
           </view>
           <view class="oreder-summary-detail">
             收款总额
@@ -136,11 +136,21 @@
         </view>
 
         <view class="number" style="margin-left: 0; margin-right: 0;">
+          <view class="button-view">
+            <view class="initial-button" bind:tap="showInitial" wx:if="{{initialValueFlag && item.startAmount && item.startAmount > 0}}">有初始</view>
+            <view class="initial-value" bind:tap="showInitial" wx:if="{{!initialValueFlag}}">
+              <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="12" contentColor="#3E69F6" fontWeight="600" title="" content="{{item.startAmount?item.startAmount:0}}">
+              </dk-cell>
+            </view>
+          </view>
           <view class="order-summary">
             <!--专业版(应收 - 收款) -->
-            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.receivableResidue ? item.receivableResidue : 0}}">
+            <!-- <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.receivableResidue ? item.receivableResidue : 0}}">
+            </dk-cell> -->
+            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.cusArrears ? item.cusArrears : 0}}">
             </dk-cell>
-          </view>
+          </view> 
+          
           <view class="oreder-summary-detail">
             客户欠款
           </view>
@@ -354,7 +364,7 @@
                             <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{cItem.priceSale}}"></dk-cell>
                           </view>
                           <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;"> {{cItem.itemQty + (cItem.packBoxText? ('(' + cItem.packBoxText + ')'):'')}}</span></view>
-                     
+
                         </view>
                       </view>
                     </van-card>

+ 19 - 1
package-basic-data/pages/register/company-param-setting/company-param-setting.js

@@ -45,7 +45,7 @@ Page({
     tableData[findex] = item
     this.setData({
       tableData: tableData
-    })
+    }) 
   },
 
   /**
@@ -175,6 +175,24 @@ Page({
   saveData(params) {
     return this.excute(this.data.service, this.data.service.updateBatch, params);
   },
+
+  
+  /**
+  * @desc : 修改参数后  更新前段的数据
+  * @date : 2024/2/1 15:49
+  * @author : 王英杰
+  */
+   handleData(){
+     let tableData = this.data.tableData
+     if(tableData&&tableData[0]&&tableData[0].children&&tableData[0].children[0]){
+      if(tableData[0].children[0]){
+        app.globalData.setting[Constants.settingCode.IVT001] =  tableData[0].children[0].settingValue//自动办理
+       }
+       if(tableData[0].children[1]){
+        app.globalData.setting[Constants.settingCode.IVT002] = tableData[0].children[1].settingValue //欠货销售
+       }
+     } 
+   },
   /**
   * @desc : 初始加载
   * @date : 2024/7/13 15:49

+ 14 - 13
package-purchase/pages/purchase-receipt/add/add.js

@@ -164,7 +164,7 @@ Page({
     purchaseService: app.globalData['purchaseService'], //采购订单 路由
     inboundProcessingService: app.globalData['inboundProcessingService'],
     // 系统参数
-    flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "true" ? true : false
+    flgAutoHandle: app.globalData.setting[Constants.settingCode.IVT001] == "true" ? true : false,
   },
   /**
    * @desc : 选择框右边删除 回调
@@ -248,7 +248,7 @@ Page({
     { //是否可编辑逻辑
       if (data.fromId) { //有来源单据 
         this.selectComponent('#' + this.data.formName).setchooseVisible(false) //隐藏选商品按钮
-        if (this.data.flgHandleSetting) { //系统参数为自动办理
+        if (this.data.flgAutoHandle) { //系统参数为自动办理
           if (this.data.nopay) { //未付款
             //大编辑
 
@@ -275,7 +275,7 @@ Page({
           element['itemQty_min'] = 1
         });
       } else { //无来源单据
-        if (this.data.flgHandleSetting) { //系统参数为自动办理  
+        if (this.data.flgAutoHandle) { //系统参数为自动办理  
           if (this.data.nopay) { //已入库(未付款),可以编辑修改数量(修改商品、数量不限制,数量改大时要校验库存量)和备注附件; 
             //大编辑
           } else { //已付款 (只可以编辑备注和附件)
@@ -598,10 +598,10 @@ Page({
       element.itemIndex = index
       delete element.itemId
     });
-    if (this.data.flgHandleSetting) {
-      params.flgAutoHandle = true
+    if (!this.data.flgAutoHandle) {
+      params.inboundProcessingFlag = false
     } else {
-      params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出入库标识 
+      params.inboundProcessingFlag = btnFormData ? btnFormData.flag : false //自动出入库标识 
     }
     if (formData.intoStatus == Constants.intoStatus.inBounded) { //已入库
       params.intoingAmt = 0 //金额
@@ -645,7 +645,7 @@ Page({
     params.annexPaths = formData.annexPaths || [] //附件 
     params.limitEdit = !this.data.readonly
     // 系统参数
-    params.flgHandleSetting = this.data.flgHandleSetting
+    params.flgAutoHandle = this.data.flgAutoHandle
     return params
   },
 
@@ -654,7 +654,7 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 王英杰
    */
-  saveData() {
+  saveData() { 
     if (this.data.formMode == Constants.formMode.edit) { //编辑保存
       return this.excute(this.data.inboundProcessingService, this.data.inboundProcessingService.inboundUpdate, this.data.params)
     } else { //新建保存
@@ -695,14 +695,18 @@ Page({
    */
   loadInit() {
 
-    let flgHandleSetting = this.data.flgHandleSetting //true为自动办理  false 为手动办理
+    let flgAutoHandle = this.data.flgAutoHandle //true为自动办理  false 为手动办理
     let contentList = this.data.contentList
-    if (flgHandleSetting) { //系统参数中的自动办理参数  隐藏左下角cheakbox
+    if (!flgAutoHandle) { //系统参数中的自动办理参数  隐藏左下角cheakbox
       // 使用 filter 方法删除 code 为 flag 的项  
       contentList = contentList.filter(item => item.code !== 'flag');
       this.setData({
         contentList: contentList,
       })
+    } else {
+      this.setData({
+        btnFormData: '{\"flag\":true}',
+      })
     }
     if (this.data.formMode == Constants.formMode.edit) {
       wx.setNavigationBarTitle({
@@ -751,8 +755,5 @@ Page({
       this.selectComponent('#' + this.data.formName).setchooseVisible(false)
     }
   },
-  onLoad() {
 
-
-  },
 })

+ 13 - 1
package-purchase/pages/purchase-receipt/purchase-receipt.js

@@ -478,7 +478,19 @@ Page({
     let contentnFootList = this.data.contentList
     let intoingQty = Number(0)
     let intoingAmt = Number(0)
-    if (this.data.active == 0  && !this.data.flgHandleSetting) {
+
+    // temp.forEach(it => {
+    //   if(it.intoStatus ==  == Constants.intoStatus.inBounded){ //已入库
+    //     intoingQty += Math.abs(Number(it.intoQty))
+    //     intoingAmt += Math.abs(Number(it.intoAmt))
+    //   }else{
+
+    //   }
+    //   it.makeTime = it.makeTime.substring(0, 10)
+     
+    // })
+    
+    if (this.data.active == 0 ) {
       // 列表区(脚部金额)
       footerAmount.name = 'intoingAmt'
       // 列表区(脚部信息)

+ 1 - 1
package-purchase/pages/purchase-receipt/purchase-receipt.wxml

@@ -6,7 +6,7 @@
   <!-- 查询条件 --> 
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['supplier','telephone'])}}">
   </dk-dropdown-menu>
-  <dk-tabs wx:if="{{!flgHandleSetting}}" active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>
+  <dk-tabs   active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>
 </van-sticky>
 
 

+ 108 - 66
package-purchase/pages/supplier-list/detail/detail.js

@@ -16,17 +16,27 @@ Page({
     purchaseService: app.globalData['purchaseService'],
     inboundProcessingService: app.globalData['inboundProcessingService'],
     supReceiptPaymentService: app.globalData['supReceiptPaymentService'],
+    initialValueFlag: true
   },
-     /**
+  /**
    * @desc : 关闭所有的tip
    * @date : 2024/5/24 15:49
    * @author : 王英杰
    */
-  handleTap(){
-    this.selectComponent('#dk-tip1').setShowTipFlag(false)
-    this.selectComponent('#dk-tip2').setShowTipFlag(false)
-    this.selectComponent('#dk-tip3').setShowTipFlag(false)
-    this.selectComponent('#dk-tip4').setShowTipFlag(false)
+  handleTap() {
+    if(this.selectComponent('#dk-tip1')){
+      this.selectComponent('#dk-tip1').setShowTipFlag(false)
+    }
+    if(this.selectComponent('#dk-tip2')){
+      this.selectComponent('#dk-tip2').setShowTipFlag(false)
+    }
+    if(this.selectComponent('#dk-tip3')){
+      this.selectComponent('#dk-tip3').setShowTipFlag(false)
+    }
+    if(this.selectComponent('#dk-tip4')){
+      this.selectComponent('#dk-tip4').setShowTipFlag(false)
+    }
+ 
   },
   /**
    * @desc : 展开明细
@@ -50,8 +60,7 @@ Page({
       this.setData({
         purchaseOutList: purchaseOutList
       })
-    }
-    else if (type == 'purchase') {
+    } else if (type == 'purchase') {
       // 销售訂單
       let purchaseList = this.data.purchaseList;
       purchaseList[index].showOrderDetailFlag = !purchaseList[index].showOrderDetailFlag
@@ -60,12 +69,12 @@ Page({
       })
     }
   },
-   
+
   /**
-* @desc : 切换tab
-* @date : 2024/5/24 15:49
-* @author : 周兴
-*/
+   * @desc : 切换tab
+   * @date : 2024/5/24 15:49
+   * @author : 周兴
+   */
   onChange(e) {
     //体验跳转显示假数据
     if (this.data.params && this.data.params.testFlag) {
@@ -75,8 +84,7 @@ Page({
       let supId = this.data.id
       if (name == 'follow') {
         this.getCusFollowList(supId)
-      }
-      else if (name == 'deal') {
+      } else if (name == 'deal') {
         this.getPurchaseList(supId)
       }
       // 收款
@@ -92,10 +100,10 @@ Page({
 
 
   /**
-  * @desc : 收款记录
-  * @date : 2024/2/1 15:49
-  * @author : 于继渤
-  */
+   * @desc : 收款记录
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   getPayRecords(supId, type) {
     let params = {}
     params.objectId = supId
@@ -124,10 +132,10 @@ Page({
     })
   },
   /**
-  * @desc : 采购订单
-  * @date : 2024/2/1 15:49
-  * @author : 于继渤
-  */
+   * @desc : 采购订单
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   getPurchaseList(supId) {
     let params = {}
     params.supId = supId
@@ -160,10 +168,10 @@ Page({
   },
 
   /**
-  * @desc : 查询入库
-  * @date : 2024/2/1 15:49
-  * @author : 于继渤
-  */
+   * @desc : 查询入库
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   getInboundProcessing(supId, type) {
     let params = {}
     params.supId = supId
@@ -184,7 +192,7 @@ Page({
               it.packageDetailsFlag = true
               if (it.skuImages && it.skuImages.value) {
                 it.skuImages.value = JSON.parse(it.skuImages.value)
-                
+
                 it['imagesUrl'] = it.skuImages.value.length > 0 ? it.skuImages.value[0].url : null
               }
               // 根据状态显示不同的字段
@@ -216,10 +224,10 @@ Page({
 
 
   /**
-  * @desc : 交易记录切换
-  * @date : 2024/2/1 15:49
-  * @author : 于继渤
-  */
+   * @desc : 交易记录切换
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   changeTag(e) {
     //体验跳转显示假数据
     if (this.data.params && this.data.params.testFlag) {
@@ -232,27 +240,41 @@ Page({
       })
       if (name == 'purchase') {
         this.getPurchaseList(data.supId)
-      }
-      else if (name == 'purchase-out') {
+      } else if (name == 'purchase-out') {
         this.getInboundProcessing(data.supId, Constants.intoType.pur)
-      }
-      else if (name == 'purchase-return') {
+      } else if (name == 'purchase-return') {
         this.getInboundProcessing(data.supId, Constants.intoType.saleReturn)
       }
     }
   },
 
   /**
-    * @desc : 给表单赋值
-    * @date : 2024/2/1 15:49
-    * @author : 于继渤
-    */
+   * @desc : 给表单赋值
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   setValuesByEdit(data) {
+    if (!this.data.freeVersionFlag) { //专业版
+      // 欠款 = 已入库 - 付款总额 - 期初余额
+      let inboundAmount = data.inboundAmount || 0 //已入库
+      let payment = data.payment || 0 //付款总额
+      let sumAmtPayable = data.sumAmtPayable || 0 //期初余额
+      data.supplierArrears = inboundAmount - payment - sumAmtPayable
+    }
     this.setData({
       item: data
     })
   },
-
+ /**
+   * @desc : 显示初始欠款
+   * @date : 2024/7/11 10:47
+   * @author : 刘尧
+   */
+  showInitial(e) {
+    this.setData({
+      initialValueFlag: !this.data.initialValueFlag
+    })
+  },
   /**
    * @desc : 跳转查看采购订单源单
    * @date : 2024/2/1 15:49
@@ -279,16 +301,21 @@ Page({
         },
         success: function (res) {
           // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的,实际中,需要从route中读取
-          res.eventChannel.emit('params', { id: item.purId, item: item, formMode: Constants.formMode.edit, formReturnMode: 'supplier' })
+          res.eventChannel.emit('params', {
+            id: item.purId,
+            item: item,
+            formMode: Constants.formMode.edit,
+            formReturnMode: 'supplier'
+          })
         }
       })
     }
   },
   /**
-  * @desc : 跳转采购退货源单
-  * @date : 2024/2/1 15:49
-  * @author : 于继渤
-  */
+   * @desc : 跳转采购退货源单
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   toOrderOutReturnDetail(e) {
     let item = e.currentTarget.dataset.item
     this.setData({
@@ -306,17 +333,22 @@ Page({
       },
       success: function (res) {
         // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的,实际中,需要从route中读取
-        res.eventChannel.emit('params', { id: item.intoId, formMode: Constants.formMode.edit, formType: Constants.formMode.detail, formReturnMode: 'supplier' })
+        res.eventChannel.emit('params', {
+          id: item.intoId,
+          formMode: Constants.formMode.edit,
+          formType: Constants.formMode.detail,
+          formReturnMode: 'supplier'
+        })
       }
     })
   },
 
 
   /**
- * @desc : 跳转查看收款源单
- * @date : 2024/2/1 15:49
- * @author : 于继渤
- */
+   * @desc : 跳转查看收款源单
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   toOriginalCollection(e) {
     let item = e.currentTarget.dataset.item
     this.setData({
@@ -341,12 +373,15 @@ Page({
       url: url,
       events: {
         // 保存成功后刷新页面
-        refresh: function (data) {
-        }
+        refresh: function (data) {}
       },
       success: function (res) {
         // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的,实际中,需要从route中读取
-        res.eventChannel.emit('params', { id: item.rpId, formMode: Constants.formMode.other, formReturnMode: 'supplier' })
+        res.eventChannel.emit('params', {
+          id: item.rpId,
+          formMode: Constants.formMode.other,
+          formReturnMode: 'supplier'
+        })
       }
     })
   },
@@ -365,15 +400,13 @@ Page({
     let gradeCode = this.data.gradeCode
     if (key == 'sale') {
       url = this.data.route.toPurOrder.url
-    }
-    else if (key == 'receipt') {
+    } else if (key == 'receipt') {
       if (gradeCode == Constants.gradeCode.STD) { //标准
         url = this.data.route.toPurReceipt.url
       } else if (gradeCode == Constants.gradeCode.PRO) {
         // url = this.data.route.toReceipt.url
       }
-    }
-    else if (key == 'saleReturn') {
+    } else if (key == 'saleReturn') {
       url = this.data.route.toPurOrderReturn.url
     }
     let that = this
@@ -381,26 +414,35 @@ Page({
       url: url,
       events: {
         // 保存成功后刷新页面
-        refresh: function (data) {
-        }
+        refresh: function (data) {}
       },
       success: function (res) {
-        res.eventChannel.emit('params', { id: that.data.item.supId, item: that.data.item, formType: Constants.formMode.add, formMode: Constants.formMode.add ,formReturnMode: 'supplier'});
+        res.eventChannel.emit('params', {
+          id: that.data.item.supId,
+          item: that.data.item,
+          formType: Constants.formMode.add,
+          formMode: Constants.formMode.add,
+          formReturnMode: 'supplier'
+        });
       }
     })
   },
 
 
   /**
-  * @desc : 初始加载
-  * @date : 2024/5/24 15:49
-  * @author : 周兴
-  */
+   * @desc : 初始加载
+   * @date : 2024/5/24 15:49
+   * @author : 周兴
+   */
   loadInit() {
     if (this.data.gradeCode == Constants.gradeCode.STD) {
 
     }
-    let e = { detail: { name: 'deal' } }
+    let e = {
+      detail: {
+        name: 'deal'
+      }
+    }
     this.onChange(e);
 
   },

+ 11 - 1
package-purchase/pages/supplier-list/detail/detail.wxml

@@ -126,9 +126,19 @@
         </view>
 
         <view class="number" style="margin-left: 0; margin-right: 0;">
+          <view class="button-view">
+            <view class="initial-button" bind:tap="showInitial" wx:if="{{initialValueFlag && item.sumAmtPayable && item.sumAmtPayable > 0}}">有初始</view>
+            <view class="initial-value" bind:tap="showInitial" wx:if="{{!initialValueFlag}}">
+              <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="12" contentColor="#3E69F6" fontWeight="600" title="" content="{{item.sumAmtPayable?item.sumAmtPayable:0}}">
+              </dk-cell>
+            </view>
+          </view>
           <view class="order-summary">
             <!--专业版(应收 - 收款) -->
-            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.payableResidue ? item.payableResidue : 0}}">
+            <!-- <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.payableResidue ? item.payableResidue : 0}}">
+            </dk-cell> -->
+            <!-- 已入库 - 付款总额 - 供应商期初 -->
+            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.supplierArrears ? item.supplierArrears : 0}}">
             </dk-cell>
           </view>
           <view class="oreder-summary-detail">

+ 32 - 0
package-purchase/pages/supplier-list/detail/detail.wxss

@@ -17,6 +17,38 @@ page {
   padding-right: 4rpx;
   flex: 1;
 }
+.button-view{
+  position: relative;
+}
+.button-view .initial-button{
+  display: flex;
+  justify-content: center;
+  align-content: center;
+  width: 100rpx;
+  font-size: 12px;
+  border-radius: 8rpx;
+  border: #3E69F6 0.5rpx solid;
+  color: #3E69F6;
+  position: absolute;
+  right: 10rpx;
+  top: 10rpx;
+}
+.button-view .initial-value{
+  display: flex;
+  justify-content: center;
+  align-content: center;
+  position: absolute;
+  right: 10rpx;
+  top: 5rpx;
+}
+.number {
+  background-color: #F4F9FF;
+  width: 100%;
+  height: 134rpx;
+  border-radius: 15rpx;
+  margin: 7px;
+
+}
 
 .status-detail-class {
   min-width: 120rpx;