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

api/pages/ivt/inbound.js

@@ -13,12 +13,12 @@ module.exports = {
       prefix: 'mdm-server/ivt/inbound/', 
       selectInboundAndItem:'select_inbound_and_item',
       purchaseInboundInsert:'purchase_inbound',
-      purchaseHandleInbound:'purchase_handle_inbound'
-
+      purchaseHandleInbound:'purchase_handle_inbound',
   },
 
   routeUrl: {
-    inbound: {
+    inbound: { 
+      handleWarehousing: { key: 'handleWarehousing', method: 'handleWarehousing', primaryKey: 'intoId', image: 'btn-chehui.png'}, //入库撤回
       inProcessing: { key: 'inProcessing', method: 'inProcessing', primaryKey: 'intoId', image: 'btn-warehousing-processing.png'}, //入库办理
       editInbound: { key: 'editInbound', method: 'editInbound', primaryKey: 'intoId', image: 'btn-edit.png'}, //编辑
       invaidOrder: { key: 'invaidOrder', method: 'invaidOrder',image: 'btn-void.png',question:true  },//作废

api/pages/ivt/inboundReturn.js

@@ -29,7 +29,9 @@ module.exports = {
       detail:{
         key:'detail',url:'/package-purchase/pages/purchase-return/detail/detail'
       },
-      openingInventory: { key: 'openingInventory', url: '/package-base-select/pages/select-data/select-data',type:'warehouse'  },
+      // openingInventory: { key: 'openingInventory', url: '/package-base-select/pages/select-data/select-data',type:'warehouse'  },
+
+      openingInventory:{ key: 'openingInventory', url: '/package-base-select/pages/select-data/select-data',type:'inventorySku'  },
       add:{
         key:'add',url:'/package-purchase/pages/purchase-return/add/add',
         formType: 'add',

api/pages/mst/customer.js

@@ -38,7 +38,13 @@ module.exports = {
       choosecusFrom: { key: 'choosecusFrom', url: '/package-base-select/pages/select-data/select-data', type: 'customerFrom' },
       chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },
       chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-data/select-data',type:'org' }, 
-      collection:{ key: 'collection', url: '/package-sales/pages/customer-collection/customer-collection', formMode: 'index', idKey: 'cusId' } //跳转客户收款
+      collection:{ key: 'collection', url: '/package-sales/pages/customer-collection/customer-collection', formMode: 'index', idKey: 'cusId', image:'btn-customer-collection.png' }, //跳转客户收款
+
+
+      toSaleOrder:{ key: 'toSaleOrder', url: '/package-sales/pages/order-billing/order-billing', formMode: 'index', idKey: 'cusId' } ,
+      toSaleOrderReturn:{ key: 'toSaleOrderReturn', url: '/package-sales/pages/order-return/order-return', formMode: 'index', idKey: 'cusId' } ,
+
+      
     }
   }
 };

components/dkbase/dk-form-bill/dk-form-bill.js

@@ -74,6 +74,10 @@ Component({
       type: String,
       value: 'iconThumPath'
     },
+    pupPriceCol: {
+      type: String,
+      value: 'priceCol'
+    },
     // 价格列
     priceCol: {
       type: String,

components/dkbase/dk-form-bill/dk-form-bill.wxml

@@ -117,6 +117,7 @@
             <view wx:if="{{!readonly}}" slot="right">删除</view>
           </van-swipe-cell>
         </view>
+        <van-empty wx:if="{{!form[itemName] || form[itemName].length == 0}}" description="暂未选择商品" />
         <block style="text-align: center; " wx:if="{{card.displayNum && form[itemName].length > card.displayNum}}">
           <view wx:if="{{card.showMore}}" class="expand-class" data-card="{{card}}" data-index="{{cardIndex}}" bindtap='expand'>
             点击收起部分
@@ -133,14 +134,12 @@
           <!--标价折扣-->
           <dk-cell amount="{{false}}" contentColor="#FF7B1A" contentFontWeight="700" titleColor="#95A8CB;" title="标价折扣" content="{{card[discountStandardCol]?card[discountStandardCol]:''  +'折'}}"></dk-cell>
         </view> 
-
         <view wx:if="{{sumAmountColFlag}}" class="amount-item-class">
           <!--条数-->
           <dk-cell titleColor="#95A8CB;" title="{{$t['together'] + (form[itemName]?form[itemName].length:0) + $t['piece']}}" amount="{{false}}"></dk-cell>
           <!--标价折扣-->
           <dk-cell fontSize="16" fontWeight="bold" contentFontWeight="700" contentColor="#FF7B1A" titleColor="#1B365D;" title="合计金额" content="{{card[sumAmountCol]?card[sumAmountCol]:0}}"></dk-cell>
         </view>
-
         <view class="amount-item-class" wx:if="{{type === 'sale'}}">
           <view style="display: flex;">
             <!--使用收款-->
@@ -243,5 +242,5 @@
   <van-datetime-picker type="date" bind:confirm="chooseDate" bind:cancel="cancelDatePop" loading="{true}"value="{{dataTime}}"  />
 </van-popup>
 
-<dk-popup type="{{popType}}" routeObjName="{{routeObjName}}" priceCol="{{priceCol}}" titleTagCol="{{titleTagCol}}" titleCol="{{titleCol}}" subCol="{{subCol}}" iconCol="{{iconCol}}" priceCol="{{priceCol}}" priceTitle="{{priceTitle}}" value="{{dataItem}}" show="{{showPop}}" contentObj="{{popContent}}" popupTopObj="{{popupTopObj}}" readonly="{{readonly}}" bind:commit="editItems">
+<dk-popup type="{{popType}}" routeObjName="{{routeObjName}}" priceCol="{{priceCol}}" titleTagCol="{{titleTagCol}}" titleCol="{{titleCol}}" subCol="{{subCol}}" iconCol="{{iconCol}}" priceCol="{{pupPriceCol}}" priceTitle="{{priceTitle}}" value="{{dataItem}}" show="{{showPop}}" contentObj="{{popContent}}" popupTopObj="{{popupTopObj}}" readonly="{{readonly}}" bind:commit="editItems">
 </dk-popup>

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

@@ -13,7 +13,7 @@
       <view style="width: 100%;">
         <view class="dk-obj-label-class">
           <view style="font-size: 17px;font-weight: bold;">{{form.objInfo[objTitle]}} </view>
-          <view style="display: flex;align-items: center;"> {{form.objInfo[objSubTitle]}}</view>
+          <view style="display: flex;align-items: center;"> {{form.objInfo[objSubTitle]!=null?form.objInfo[objSubTitle]:''}}</view>
         </view>
         <view class="dk-obj-amount-class" wx:if="{{amountArr && amountArr.length > 0}}">
           <view style="width: {{100/amountArr.length + '%'}};margin-top: 20rpx;" wx:for="{{amountArr}}" wx:for-item="amount" data-item="{{amount}}" wx:for-index="amountIndex">

i18n/zh-CN.js

@@ -288,6 +288,7 @@ const columns = {
   null: '',
   test: '测试',
   followCount: '跟进次数',
+  followType: '跟进方式',
   nextFollowTime: '跟进提醒',
   follow: '客户跟进',
   customerName: '客户名称',
@@ -336,6 +337,7 @@ const saleOrder = {
   totalReturn: '退货总额',
   outOfStorage: '出库中',
   handleWithdrawal: '办理撤回',
+  handleWarehousing: '入库撤回',
   saleOutBoundInfo: '取消自动出库办理，需要在“出库办理”功能进行手工出货办理。',
 }
 //资金管理

mixins/index.js

@@ -278,7 +278,7 @@ module.exports = {
         return;
       }
       // 如果有链接，就跳转
-      console.log('url', routeUrl);
+      console.log('url', routeUrl); 
       if (routeUrl.url) {
         let url = routeUrl.url
         //保存按钮自定义跳转URL
@@ -344,7 +344,7 @@ module.exports = {
             res.eventChannel.emit('params', data);
           }
         })
-      } else {
+      } else { 
         // 如果是方法就执行方法
         if (routeUrl.method) {
           // 有提示信息，就提出

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

@@ -78,7 +78,7 @@ Page({
     // 弹出按钮
     buttonList: [{
       name: 'merge',
-      title: mixins.$t('returnAmount')
+      title: ''//mixins.$t('returnAmount')
     }],
     contentList: [{
       code: 'need',
@@ -96,6 +96,7 @@ Page({
     paymentResidue: 0,
     bill: 0,
     objInfo: {},
+    readonly: false,
     table: Constants.tables.recPay,
   },
 
@@ -106,53 +107,58 @@ Page({
     */
   loadInit() {
     let _this = this
+    let buttonList = this.data.buttonList
     if (this.data.formMode == Constants.formMode.edit) {
       wx.setNavigationBarTitle({
         title: mixins.$t('paymentReturnOrderEdit'),
       })
-
+      buttonList[0].title = mixins.$t('save')
     } else {
       wx.setNavigationBarTitle({
         title: mixins.$t('paymentReturnOrderAdd'),
       })
+      buttonList[0].title = mixins.$t('returnAmount')
       // 新增
       if (this.data.formData != undefined) {
         this.setData({
           formData: JSON.stringify({ accDate: new Date().toDateStr() })
         })
       }
-    }
-    let formData = JSON.parse(this.data.formData)
-    let objInfo = this.data.item
-    let contentObj = this.data.contentObj
-    formData.objInfo = objInfo
-    let supId = objInfo.objectId
-    formData.supId = supId
-    let params = {
-      objectId: supId,
-      formType: 'refund'
-    }
-    this.excute(this.data.accountService, this.data.accountService.getPayableAccountItem, params).then(res => {
-      if (res.data.data.length == 0) {
-        formData.cancelAmount = false
-      } else {
-        formData.cancelAmount = true
+      let formData = JSON.parse(this.data.formData)
+      let objInfo = this.data.item
+      let contentObj = this.data.contentObj
+      formData.objInfo = objInfo
+      let supId = objInfo.objectId
+      formData.supId = supId
+      let params = {
+        objectId: supId,
+        formType: 'refund'
       }
-      formData.sumWaiveAmt = 0
-      formData.sumAmtRec = 0.00
-      formData.payableList = res.data.data
-      let payableResidue = res.data.data.sum("amtResidue")
+      this.excute(this.data.accountService, this.data.accountService.getPayableAccountItem, params).then(res => {
+        if (res.data.data.length == 0) {
+          formData.cancelAmount = false
+        } else {
+          formData.cancelAmount = true
+        }
+        formData.sumWaiveAmt = 0
+        formData.sumAmtRec = 0.00
+        formData.payableList = res.data.data
+        let payableResidue = res.data.data.sum("amtResidue")
+
+        _this.setForm(formData, contentObj, payableResidue,
+          objInfo.paymentResidue, res.data.data)
+        _this.setData({
+          payableList: res.data.data,
+          objInfo,
+          payableResidue: objInfo.payableResidue,
+          paymentResidue: objInfo.paymentResidue,
+          bill: res.data.data.length
+        })
 
-      _this.setForm(formData, contentObj, payableResidue,
-        objInfo.paymentResidue, res.data.data)
-      _this.setData({
-        payableList: res.data.data,
-        objInfo,
-        payableResidue: objInfo.payableResidue,
-        paymentResidue: objInfo.paymentResidue,
-        bill: res.data.data.length
       })
-
+    }
+    this.setData({
+      buttonList,
     })
 
   },
@@ -200,6 +206,45 @@ Page({
   },
 
   /**
+  * @desc : 给表单赋值
+  * @date : 2024/2/1 15:49
+  * @author : 姜永辉
+  */
+  setValuesByEdit(data) {
+    if (this.data.formMode == Constants.formMode.edit) {
+      let contentObj = this.data.contentObj
+      let formData = { ...this.data.item }
+      let form = {}
+      formData.objInfo = this.data.item
+      formData.receivableList = data.recPayHandleItem
+      formData.objInfo.cusId = this.data.item.objectId
+      // 收款总额
+      formData.collectAmount = formData.sumAmtRec
+      formData.receivableResidue = formData.sumShouldHandle
+      formData.currentReceivableResidue = formData.sumAmtReceivableHandle  // 本次核销金额
+      formData.totalWriteOffAmount = formData.currentReceivableResidue  // 核销总额
+      formData.receiptResidue = data.data.sumUsePaymentResidue  //预付抵扣
+      contentObj['bill'].forEach(itcard => {
+        if (itcard.code === 'cancelAmount') {
+          //单数和金额
+          itcard.bill = data.recPayHandleItem.length
+          itcard.amount = formData.sumShouldHandle // 待核销金额
+        }
+
+      })
+
+      this.setData({
+        itemData: data,
+        form: JSON.stringify(form),
+        contentObj,
+        readonly: true,
+        formData: JSON.stringify(formData),
+      })
+    }
+
+  },
+
+  /**
    * @desc : 选择供应商后的回调
    * @date : 2024/2/1 15:49
    * @author : 姜永辉
@@ -422,7 +467,7 @@ Page({
   setParams(params) {
     let formData = JSON.parse(this.data.formData)
     if (Number(formData.sumAmtPay) != 0) {
-      console.log("setParams",params);
+      console.log("setParams", params);
       return params
     }
     //收付款类型-收款的查询参数
@@ -437,8 +482,11 @@ Page({
     params.sumAmtPayableHandle = formData.currentPayableResidue
     // 合计优惠金额
     params.sumWaiveAmt = formData.sumWaiveAmt
-    // 预存的使用
-    params.paymentResidue = formData.paymentResidue
+    // 预付抵扣
+    params.sumUsePaymentResidue = formData.paymentResidue
+    // 待核销金额
+    params.sumShouldHandle = formData.payableResidue
+
     params.annexPaths = formData.annexPaths || [] //附件 
     // params.biznisType = null
     // params.biznisId	 = null
@@ -450,6 +498,9 @@ Page({
     params.itemList = [] //明细 
     let rlsit = this.setReturnPayableList(formData.payableList || [], formData.sumWaiveAmt, formData.currentPayableResidue, formData.payableResidue)
     params.payableList = rlsit //应付款的明细 
+    if (this.data.formMode == Constants.formMode.edit) {
+      params.rpId = formData.rpId
+    }
     return params
   },
 
@@ -511,6 +562,9 @@ Page({
   */
   saveData() {
     let formData = JSON.parse(this.data.formData)
+    if (this.data.formMode == Constants.formMode.edit) {
+      return this.excute(this.data.service, this.data.service.updatePayableReceipt, this.data.params)
+    }
     if (formData.sumAmtPay == 0) {
       return this.excute(this.data.service, this.data.service.insertPayableReceipt, this.data.params)
     } else {

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

@@ -1,6 +1,6 @@
 <loading wx:if="{{loading}}"></loading>
 
-<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objIdCol="supId" objTitle="supCode" objSubTitle="supName" objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" totalObj="{{totalObj}}" table="{{table}}" amountArr="{{amountArr}}" bind:chooseObjTypeData="chooseObjTypeData" bind:changeNumber="changeNumber" bind:onCheckChange="onCheckChange">
+<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objIdCol="supId" objTitle="supName"   objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" totalObj="{{totalObj}}" table="{{table}}" readonly = "{{readonly}}" amountArr="{{amountArr}}" bind:chooseObjTypeData="chooseObjTypeData" bind:changeNumber="changeNumber" bind:onCheckChange="onCheckChange">
 </dk-form-more-items>
 
 <view style="height: 220rpx;"></view>

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

@@ -96,7 +96,7 @@ Page({
     paymentResidue: 0,
     bill: 0,
     objInfo: {},
-    readonly:false,
+    readonly: false,
     table: Constants.tables.recPay,
   },
 
@@ -106,17 +106,17 @@ Page({
     * @author : 姜永辉
     */
   loadInit() {
-    let buttonList = this.data.buttonList 
+    let buttonList = this.data.buttonList
     if (this.data.formMode == Constants.formMode.edit) {
       wx.setNavigationBarTitle({
         title: mixins.$t('paymentOrderEdit'),
       })
-      buttonList[0].title=mixins.$t('save')
+      buttonList[0].title = mixins.$t('save')
     } else {
       wx.setNavigationBarTitle({
         title: mixins.$t('paymentOrderAdd'),
       })
-      buttonList[0].title=mixins.$t('payment')
+      buttonList[0].title = mixins.$t('payment')
       // 新增
       if (this.data.formData != undefined) {
         this.setData({
@@ -124,47 +124,47 @@ Page({
         })
       }
     }
-    this.setData({ 
-      buttonList, 
+    this.setData({
+      buttonList,
     })
 
   },
 
-/**
+  /**
   * @desc : 给表单赋值
   * @date : 2024/2/1 15:49
   * @author : 姜永辉
   */
- setValuesByEdit(data) { 
-  let contentObj = this.data.contentObj
-  let formData = { ...this.data.item }
-  let form = {}
-  formData.objInfo = this.data.item
-  formData.receivableList = data.recPayHandleItem
-  formData.objInfo.cusId = this.data.item.objectId
-  // 收款总额
-  formData.collectAmount = formData.sumAmtRec
-  formData.receivableResidue = formData.sumShouldHandle
-  formData.currentReceivableResidue = formData.sumAmtReceivableHandle  // 本次核销金额
-  formData.totalWriteOffAmount = formData.currentReceivableResidue  // 核销总额
-  formData.receiptResidue = data.data.sumUseReceiptResidue  //预收抵扣
-  contentObj['bill'].forEach(itcard => {
-    if (itcard.code === 'cancelAmount') {
-      //单数和金额
-      itcard.bill = data.recPayHandleItem.length
-      itcard.amount = formData.sumShouldHandle // 待核销金额
-    }
+  setValuesByEdit(data) {
+    let contentObj = this.data.contentObj
+    let formData = { ...this.data.item }
+    let form = {}
+    formData.objInfo = this.data.item
+    formData.receivableList = data.recPayHandleItem
+    formData.objInfo.cusId = this.data.item.objectId
+    // 收款总额
+    formData.collectAmount = formData.sumAmtRec
+    formData.receivableResidue = formData.sumShouldHandle
+    formData.currentReceivableResidue = formData.sumAmtReceivableHandle  // 本次核销金额
+    formData.totalWriteOffAmount = formData.currentReceivableResidue  // 核销总额
+    formData.receiptResidue = data.data.sumUsePaymentResidue  //预付抵扣
+    contentObj['bill'].forEach(itcard => {
+      if (itcard.code === 'cancelAmount') {
+        //单数和金额
+        itcard.bill = data.recPayHandleItem.length
+        itcard.amount = formData.sumShouldHandle // 待核销金额
+      }
 
-  }) 
+    })
 
-  this.setData({
-    itemData: data, 
-    form:JSON.stringify(form),
-    contentObj,
-    readonly:true,
-    formData: JSON.stringify(formData),
-  })
-},
+    this.setData({
+      itemData: data,
+      form: JSON.stringify(form),
+      contentObj,
+      readonly: true,
+      formData: JSON.stringify(formData),
+    })
+  },
 
 
   /**
@@ -282,7 +282,7 @@ Page({
     let formData = JSON.parse(this.data.formData)
     let code = e.detail.code
     let data = e.detail.data
-    console.log("changeNumber",code,data,formData);
+    console.log("changeNumber", code, data, formData);
     // 本次付款金额
     if (code == "sumAmtPay") {
       formData.sumAmtPay = data
@@ -308,15 +308,15 @@ Page({
       formData.sumWaiveAmt = data
     }
     // 预付扣减 
-     // 预付扣减 =   绝对值（本退款 +  优惠 ）- 绝对值（本次核销）和 预付金额 两者 的最小值
-     let cAmount = Math.abs(Number(formData.sumAmtPay ? formData.sumAmtPay : 0))
-     + Math.abs(Number(formData.sumWaiveAmt))
-   if (Math.abs(cAmount - Number(formData.currentPayableResidue)) > Math.abs(Number(this.data.paymentResidue))) {
-     formData.paymentResidue = cAmount - Math.abs(Number(formData.currentPayableResidue)) > 0 ? 0 : Math.abs(Number(this.data.paymentResidue))
-   } else {
-
-     formData.paymentResidue = cAmount - Math.abs(Number(formData.currentPayableResidue)) < 0 ?    Math.abs(Number(formData.currentPayableResidue))-cAmount   : 0
-   }
+    // 预付扣减 =   绝对值（本退款 +  优惠 ）- 绝对值（本次核销）和 预付金额 两者 的最小值
+    let cAmount = Math.abs(Number(formData.sumAmtPay ? formData.sumAmtPay : 0))
+      + Math.abs(Number(formData.sumWaiveAmt))
+    if (Math.abs(cAmount - Number(formData.currentPayableResidue)) > Math.abs(Number(this.data.paymentResidue))) {
+      formData.paymentResidue = cAmount - Math.abs(Number(formData.currentPayableResidue)) > 0 ? 0 : Math.abs(Number(this.data.paymentResidue))
+    } else {
+
+      formData.paymentResidue = cAmount - Math.abs(Number(formData.currentPayableResidue)) < 0 ? Math.abs(Number(formData.currentPayableResidue)) - cAmount : 0
+    }
     // 本次付款 +  优惠 + 预付扣减 > 本次核销 == 转预付金额
     let toAdvancePrepaidAmount = Number(formData.sumAmtPay) + Number(formData.sumWaiveAmt) + Number(formData.paymentResidue) - Number(formData.currentPayableResidue)
     if (toAdvancePrepaidAmount > 0) {
@@ -348,7 +348,7 @@ Page({
     formData.payableResidue = payableResidue  // 待核销金额
     formData.currentPayableResidue = payableResidue  // 本次核销金额
     formData.totalWriteOffAmount = payableResidue  // 核销总额
- 
+
     // 预存扣减金额 =   绝对值（本退款 +  优惠 ）- 绝对值（本次核销）和 预存金额 两者 的最小值
     let cAmount = Math.abs(Number(formData.sumAmtPay ? formData.sumAmtPay : 0))
       + Math.abs(Number(formData.sumWaiveAmt))
@@ -378,10 +378,10 @@ Page({
         itcard.bill = bill
         itcard.amount = payableResidue //总应付
       } else if (itcard.code === 'sumWaiveAmt'
-      || itcard.code === 'currentPayableResidue') {
-      //优惠 本次核销是否只读
-      itcard.readonly = Number(formData.currentPayableResidue) == 0 ? true : false
-    }
+        || itcard.code === 'currentPayableResidue') {
+        //优惠 本次核销是否只读
+        itcard.readonly = Number(formData.currentPayableResidue) == 0 ? true : false
+      }
     })
     this.setData({
       contentObj,
@@ -407,13 +407,13 @@ Page({
     contentObj['bill'].forEach(itcard => {
       if (itcard.code === 'cancelAmount') {
         //单数和金额
-        bill  = itcard.bill  
-      } 
+        bill = itcard.bill
+      }
     })
     if (Number(formData.currentPayableResidue) == 0
       && Number(formData.sumAmtPay) == 0
       && Number(bill) == 0
-      ) {
+    ) {
       msgError = '本次核销金额和本次付款不能同时为0'
     }
 
@@ -457,8 +457,10 @@ Page({
     params.sumAmtPayableHandle = formData.currentPayableResidue
     // 合计优惠金额
     params.sumWaiveAmt = formData.sumWaiveAmt
-    // 预存的使用
-    params.paymentResidue = formData.paymentResidue
+    // 预付抵扣
+    params.sumUsePaymentResidue = formData.paymentResidue
+    // 待核销金额
+    params.sumShouldHandle = formData.payableResidue
     params.annexPaths = formData.annexPaths || [] //附件 
     // params.biznisType = null
     // params.biznisId	 = null
@@ -516,16 +518,16 @@ Page({
 
   },
 
-    /**
-  * @desc :处理保存后续
-  * @date : 2024/2/1 15:49
-  * @author : 姜永辉
-  */
- handleData() {
-  this.setData({
-    formData: JSON.stringify({ accDate: new Date().toDateStr() })
-  })
-},
+  /**
+* @desc :处理保存后续
+* @date : 2024/2/1 15:49
+* @author : 姜永辉
+*/
+  handleData() {
+    this.setData({
+      formData: JSON.stringify({ accDate: new Date().toDateStr() })
+    })
+  },
 
   /**
   * @desc : 保存数据服务

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

@@ -113,11 +113,14 @@ Page({
     formData.receivableList = data.recPayHandleItem
     formData.objInfo.cusId = this.data.item.objectId
     // 收款总额
-    formData.collectAmount = formData.sumAmtRec
-    formData.receivableResidue = formData.sumShouldHandle
-    formData.currentReceivableResidue = formData.sumAmtReceivableHandle  // 本次核销金额
-    formData.totalWriteOffAmount = formData.currentReceivableResidue  // 核销总额
-    formData.receiptResidue = data.data.sumUseReceiptResidue  //预收抵扣
+    formData.paymentAmount = formData.sumAmtPay
+    
+    formData.payableResidue = formData.sumShouldHandle
+    formData.currentPayableResidue = formData.sumAmtPayableHandle  // 本次核销金额
+    formData.totalWriteOffAmount = formData.currentPayableResidue  // 核销总额
+    formData.paymentResidue = formData.sumUsePaymentResidue  //预收抵扣
+ 
+
     contentObj['bill'].forEach(itcard => {
       if (itcard.code === 'cancelAmount') {
         //单数和金额

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

@@ -1,6 +1,6 @@
 <loading wx:if="{{loading}}"></loading>
 
-<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objIdCol="supId" objTitle="supCode" objSubTitle="supName" objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" totalObj="{{totalObj}}" table="{{table}}" amountArr="{{amountArr}}" bind:chooseObjTypeData="chooseObjTypeData" bind:changeNumber="changeNumber" bind:onCheckChange="onCheckChange">
+<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objIdCol="supId" objTitle="supName"   objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" totalObj="{{totalObj}}" table="{{table}}" readonly = "{{true}}" amountArr="{{amountArr}}" bind:chooseObjTypeData="chooseObjTypeData" bind:changeNumber="changeNumber" bind:onCheckChange="onCheckChange">
 </dk-form-more-items>
 
 <view style="height: 220rpx;"></view>
@@ -11,7 +11,7 @@
 
 
 <!-- 详情 -->
-<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" bind:open="openInfo"></dk-save-button>
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonFootList}}" bind:open="openInfo"></dk-save-button>
 
 <!-- 底部编辑 以后要做 todo......... -->
 <!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;"  >

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

@@ -8,7 +8,7 @@
  *******************************************************************************/
 const mixins = require('@/mixins/index.js')
 const Constants = require('@/utils/Constants.js');
-const util = require('@/utils/util.js') 
+const util = require('@/utils/util.js')
 const app = getApp();
 Page({
   mixins: [mixins],
@@ -76,7 +76,7 @@ Page({
     // 弹出按钮
     buttonList: [{
       name: 'merge',
-      title: mixins.$t('returnAmount')
+      title: ''//mixins.$t('returnAmount')
     }],
     contentList: [{
       code: 'need',
@@ -94,76 +94,117 @@ Page({
     receiptResidue: 0,
     bill: 0,
     objInfo: {},
+    readonly:false,
     table: Constants.tables.recPay,
   },
   /**
-    * @desc : 页面加载数据方法
-    * @date : 2024/2/1 15:49
-    * @author : 姜永辉
-    */
+  * @desc : 页面加载数据方法
+  * @date : 2024/2/1 15:49
+  * @author : 姜永辉
+  */
   loadInit() {
     let _this = this
-    console.log(this.data.item, this.data.formMode);
+    let buttonList = this.data.buttonList
     if (this.data.formMode == Constants.formMode.edit) {
       wx.setNavigationBarTitle({
         title: mixins.$t('receiptReturnOrderEdit'),
       })
-
+      buttonList[0].title = mixins.$t('save')
     } else {
       wx.setNavigationBarTitle({
         title: mixins.$t('receiptReturnOrderAdd'),
       })
+      buttonList[0].title = mixins.$t('returnAmount')
       // 新增
       if (this.data.formData != undefined) {
         this.setData({
           formData: JSON.stringify({ accDate: new Date().toDateStr() })
         })
       }
-    }
-    let formData = JSON.parse(this.data.formData)
-    let objInfo = this.data.item
-    let contentObj = this.data.contentObj
-    formData.objInfo = objInfo
-    let cusId = objInfo.objectId
-    formData.cusId = cusId
-    // this.setData({
-    //   objInfo ,
-    //   formData: JSON.stringify(formData)
-    // })
+      let formData = JSON.parse(this.data.formData)
+      let objInfo = this.data.item
+      let contentObj = this.data.contentObj
+      formData.objInfo = objInfo
+      let cusId = objInfo.objectId
+      formData.cusId = cusId
 
-    let params = {
-      objectId: cusId,
-      formType: 'refund'
-    }
-    this.excute(this.data.accountService, this.data.accountService.getReceivableAccountItem, params).then(res => {
-      if (res.data.data.length == 0) {
-        formData.cancelAmount = false
-      } else {
-        formData.cancelAmount = true
+      let params = {
+        objectId: cusId,
+        formType: 'refund'
       }
-      formData.sumWaiveAmt = 0
-      formData.sumAmtRec = 0.00
-      formData.receivableList = res.data.data
-      let receivableResidue = res.data.data.sum("amtResidue")
+      this.excute(this.data.accountService, this.data.accountService.getReceivableAccountItem, params).then(res => {
+        if (res.data.data.length == 0) {
+          formData.cancelAmount = false
+        } else {
+          formData.cancelAmount = true
+        }
+        formData.sumWaiveAmt = 0
+        formData.sumAmtRec = 0.00
+        formData.receivableList = res.data.data
+        let receivableResidue = res.data.data.sum("amtResidue")
 
 
-      _this.setForm(formData, contentObj, receivableResidue,
-        objInfo.receiptResidue, res.data.data.length)
-      _this.setData({
-        receivableList: res.data.data,
-        receivableResidue: objInfo.receivableResidue,
-        receiptResidue: objInfo.receiptResidue,
-        bill: res.data.data.length
+        _this.setForm(formData, contentObj, receivableResidue,
+          objInfo.receiptResidue, res.data.data.length)
+        _this.setData({
+          receivableList: res.data.data,
+          receivableResidue: objInfo.receivableResidue,
+          receiptResidue: objInfo.receiptResidue,
+          bill: res.data.data.length
+        })
+
       })
+    }
 
+    this.setData({
+      buttonList,
     })
   },
 
   /**
-      * @desc   : 绑定数据-选择页面返回的逻辑处理
-      * @author : 姜永辉
-      * @date   : 2024年3月12日
-      */
+   * @desc : 给表单赋值
+   * @date : 2024/2/1 15:49
+   * @author : 姜永辉
+   */
+  setValuesByEdit(data) {
+    if (this.data.formMode == Constants.formMode.edit) {
+      let contentObj = this.data.contentObj
+      let formData = { ...this.data.item }
+      let form = {}
+      formData.objInfo = this.data.item
+      formData.receivableList = data.recPayHandleItem
+      formData.objInfo.cusId = this.data.item.objectId
+      // 收款总额
+      formData.collectAmount = formData.sumAmtRec
+      formData.receivableResidue = formData.sumShouldHandle
+      formData.currentReceivableResidue = formData.sumAmtReceivableHandle  // 本次核销金额
+      formData.totalWriteOffAmount = formData.currentReceivableResidue  // 核销总额
+      formData.receiptResidue = data.data.sumUseReceiptResidue  //预收抵扣
+      contentObj['bill'].forEach(itcard => {
+        if (itcard.code === 'cancelAmount') {
+          //单数和金额
+          itcard.bill = data.recPayHandleItem.length
+          itcard.amount = formData.sumShouldHandle // 待核销金额
+        }
+
+      })
+
+
+      this.setData({
+        itemData: data,
+        form: JSON.stringify(form),
+        contentObj,
+        readonly: true,
+        formData: JSON.stringify(formData),
+      })
+    }
+  },
+
+  /**
+  * @desc   : 绑定数据-选择页面返回的逻辑处理
+  * @author : 姜永辉
+  * @date   : 2024年3月12日
+  */
   chooseData(e) {
     let formData = JSON.parse(this.data.formData)
     let cardList_ = this.data.cardList
@@ -397,7 +438,7 @@ Page({
       + Math.abs(Number(formData.sumWaiveAmt))
       > Math.abs(Number(formData.currentReceivableResidue))
       + Math.abs(Number(formData.receiptResidue))) {
-        msgError = '退款金额超出应退金额' 
+      msgError = '退款金额超出应退金额'
     }
 
     if (msgError != null) {
@@ -430,8 +471,10 @@ Page({
     params.sumAmtReceivableHandle = formData.currentReceivableResidue
     // 合计优惠金额
     params.sumWaiveAmt = formData.sumWaiveAmt
-    // 预存的使用
-    params.receiptResidue = formData.receiptResidue
+    // 预存抵扣
+    params.sumUseReceiptResidue = formData.receiptResidue
+    // 待核销金额
+    params.sumShouldHandle = formData.receivableResidue
     params.annexPaths = formData.annexPaths || [] //附件 
     // params.biznisType = null
     // params.biznisId	 = null
@@ -443,7 +486,9 @@ Page({
     params.itemList = [] //明细 
     let rlsit = this.setReturnReceivableList(formData.receivableList || [], formData.sumWaiveAmt, formData.currentReceivableResidue, formData.receivableResidue)
     params.receivableList = rlsit //应收收款的明细 
-
+    if (this.data.formMode == Constants.formMode.edit) {
+      params.rpId = formData.rpId
+    }
     return params
   },
 
@@ -505,6 +550,9 @@ Page({
   */
   saveData() {
     let formData = JSON.parse(this.data.formData)
+    if (this.data.formMode == Constants.formMode.edit) {
+      return this.excute(this.data.service, this.data.service.updateReceivableReceipt, this.data.params)
+    }
     // 本次收款金额大于0 进入收款页面否则 直接保存
     if (formData.sumAmtRec == 0) {
       return this.excute(this.data.service, this.data.service.insertReceivableReceipt, this.data.params)
@@ -524,7 +572,7 @@ Page({
       url: '/package-base-select/pages/select-collection_confirm/select-collection_confirm',
       events: {
         // 回调后
-        refresh: function (data) { 
+        refresh: function (data) {
           // 保存成功后 回调
           _this.setData({
             formData: JSON.stringify({ accDate: new Date().toDateStr() })

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

@@ -1,6 +1,6 @@
 <loading wx:if="{{loading}}"></loading>
 
-<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objCol="customerId" objLabel="{{$t['cusName']}}" objType="customer" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" table="{{table}}" bind:chooseObjTypeData="chooseObjTypeData" totalObj="{{totalObj}}" amountArr="{{amountArr}}" bind:onCheckChange="onCheckChange" bind:changeNumber="changeNumber">
+<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objCol="customerId" objLabel="{{$t['cusName']}}" objType="customer" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData" readonly = "{{readonly}}" table="{{table}}" bind:chooseObjTypeData="chooseObjTypeData" totalObj="{{totalObj}}" amountArr="{{amountArr}}" bind:onCheckChange="onCheckChange" bind:changeNumber="changeNumber">
 </dk-form-more-items>
 
 <view style="height: 220rpx;"></view> 

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

@@ -95,7 +95,7 @@ Page({
     receiptResidue: 0,
     bill: 0,
     objInfo: {},
-    readonly:false,
+    readonly: false,
     table: Constants.tables.recPay,
   },
   /**
@@ -103,18 +103,18 @@ Page({
     * @date : 2024/2/1 15:49
     * @author : 姜永辉
     */
-  loadInit() { 
-    let buttonList = this.data.buttonList 
+  loadInit() {
+    let buttonList = this.data.buttonList
     if (this.data.formMode == Constants.formMode.edit) {
       wx.setNavigationBarTitle({
         title: mixins.$t('receiptOrderEdit'),
       })
-      buttonList[0].title=mixins.$t('save')
+      buttonList[0].title = mixins.$t('save')
     } else {
       wx.setNavigationBarTitle({
         title: mixins.$t('receiptOrderAdd'),
       })
-      buttonList[0].title=mixins.$t('collection')
+      buttonList[0].title = mixins.$t('collection')
       // 新增
       if (this.data.formData != undefined) {
         this.setData({
@@ -122,47 +122,47 @@ Page({
         })
       }
     }
-    this.setData({ 
-      buttonList, 
+    this.setData({
+      buttonList,
     })
   },
 
-   /**
-  * @desc : 给表单赋值
-  * @date : 2024/2/1 15:49
-  * @author : 姜永辉
-  */
- setValuesByEdit(data) {  
-  let contentObj = this.data.contentObj
-  let formData = { ...this.data.item }
-  let form = {}
-  formData.objInfo = this.data.item
-  formData.receivableList = data.recPayHandleItem
-  formData.objInfo.cusId = this.data.item.objectId
-  // 收款总额
-  formData.collectAmount = formData.sumAmtRec
-  formData.receivableResidue = formData.sumShouldHandle
-  formData.currentReceivableResidue = formData.sumAmtReceivableHandle  // 本次核销金额
-  formData.totalWriteOffAmount = formData.currentReceivableResidue  // 核销总额
-  formData.receiptResidue = data.data.sumUseReceiptResidue  //预收抵扣
-  contentObj['bill'].forEach(itcard => {
-    if (itcard.code === 'cancelAmount') {
-      //单数和金额
-      itcard.bill = data.recPayHandleItem.length
-      itcard.amount = formData.sumShouldHandle // 待核销金额
-    }
+  /**
+ * @desc : 给表单赋值
+ * @date : 2024/2/1 15:49
+ * @author : 姜永辉
+ */
+  setValuesByEdit(data) {
+    let contentObj = this.data.contentObj
+    let formData = { ...this.data.item }
+    let form = {}
+    formData.objInfo = this.data.item
+    formData.receivableList = data.recPayHandleItem
+    formData.objInfo.cusId = this.data.item.objectId
+    // 收款总额
+    formData.collectAmount = formData.sumAmtRec
+    formData.receivableResidue = formData.sumShouldHandle
+    formData.currentReceivableResidue = formData.sumAmtReceivableHandle  // 本次核销金额
+    formData.totalWriteOffAmount = formData.currentReceivableResidue  // 核销总额
+    formData.receiptResidue = data.data.sumUseReceiptResidue  //预收抵扣
+    contentObj['bill'].forEach(itcard => {
+      if (itcard.code === 'cancelAmount') {
+        //单数和金额
+        itcard.bill = data.recPayHandleItem.length
+        itcard.amount = formData.sumShouldHandle // 待核销金额
+      }
 
-  })  
-  
+    })
 
-  this.setData({
-    itemData: data, 
-    form: JSON.stringify(form),
-    contentObj, 
-    readonly:true,
-    formData: JSON.stringify(formData),
-  })
-},
+
+    this.setData({
+      itemData: data,
+      form: JSON.stringify(form),
+      contentObj,
+      readonly: true,
+      formData: JSON.stringify(formData),
+    })
+  },
 
   /**
       * @desc   : 绑定数据-选择页面返回的逻辑处理
@@ -385,7 +385,7 @@ Page({
 
     })
     this.setData({
-      contentObj, 
+      contentObj,
       formData: JSON.stringify(formData)
     })
   },
@@ -408,13 +408,13 @@ Page({
     contentObj['bill'].forEach(itcard => {
       if (itcard.code === 'cancelAmount') {
         //单数和金额
-        bill  = itcard.bill  
-      } 
+        bill = itcard.bill
+      }
     })
     if (Number(formData.currentReceivableResidue) == 0
       && Number(formData.sumAmtRec) == 0
       && Number(bill) == 0
-      ) {
+    ) {
       msgError = '本次核销金额和本次收款不能同时为0'
     }
     // 预存+本次收款 + 优惠》= 本次核销
@@ -455,8 +455,10 @@ Page({
     params.sumAmtReceivableHandle = formData.currentReceivableResidue
     // 合计优惠金额
     params.sumWaiveAmt = formData.sumWaiveAmt
-    // 预存的使用
-    params.receiptResidue = formData.receiptResidue
+    // 预存抵扣
+    params.sumUseReceiptResidue = formData.receiptResidue
+    // 待核销金额
+    params.sumShouldHandle = formData.receivableResidue
     params.annexPaths = formData.annexPaths || [] //附件 
     // params.biznisType = null
     // params.biznisId	 = null

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

@@ -115,7 +115,7 @@ Page({
     formData.receivableResidue = formData.sumShouldHandle
     formData.currentReceivableResidue = formData.sumAmtReceivableHandle  // 本次核销金额
     formData.totalWriteOffAmount = formData.currentReceivableResidue  // 核销总额
-    formData.receiptResidue = data.data.sumUseReceiptResidue  //预收抵扣
+    formData.receiptResidue = formData.sumUseReceiptResidue  //预收抵扣
     contentObj['bill'].forEach(itcard => {
       if (itcard.code === 'cancelAmount') {
         //单数和金额

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

@@ -27,7 +27,7 @@ mixins: [mixins],
       guId: "474fd125-7b97-4c30-88f2-5dd731fd111b",
       page: "orderBillingAdd",
       pageIndex: "undefined",
-      routeObjName: 'receiptPayment', 
+      routeObjName: 'receiptPayment',
       paymentService: app.globalData['paymentService'],
       moneyAccountService: app.globalData['moneyAccountService'],
       otherReceivableService: app.globalData['otherReceivableService'],
@@ -201,7 +201,7 @@ mixins: [mixins],
       let form = this.data.form
       let itemList = []
       //收付款类型-收款的查询参数
-      params.rpType = params.rpType ? params.rpType : Constants.rpType.receipt 
+      params.rpType = params.rpType ? params.rpType : Constants.rpType.receipt
       params.orgId = form.orgId  //组织部门
       params.staffId = form.staffId  // 员工
       // 合计优惠金额
@@ -214,17 +214,20 @@ mixins: [mixins],
       //  根据formtype不同值 
       // formType ：1 收款单 ，2 付款单，3 客户收款保存参数,4 客户退款 5 退收款单 6 退付款单  7 订单开单收款
       if (this.data.formType == 1) {
-        params.rpType = Constants.rpType.receipt 
+        params.rpType = Constants.rpType.receipt
         // 1 收款单
         params.objectId = this.data.form.objInfo.objectId  // 客户
         // 收款金额					
         params.sumAmtRec = Number(form.sumAmount)
         // 合计应收冲抵金额								
         params.sumAmtReceivableHandle = form.currentReceivableResidue
-        // 预存的使用
-        params.receiptResidue = form.receiptResidue
         // 合计优惠金额
         params.sumWaiveAmt = form.sumWaiveAmt
+        // 预存抵扣
+        params.sumUseReceiptResidue = formData.receiptResidue
+        // 待核销金额
+        params.sumShouldHandle = formData.receivableResidue
+
         let rlsit = this.setReturnReceivableList(form.receivableList || [], form.sumWaiveAmt, form.currentReceivableResidue, form.receivableResidue)
         params.receivableList = rlsit //应收收款的明细 
         tableData.forEach(item => {
@@ -240,15 +243,21 @@ mixins: [mixins],
         })
 
       } else if (this.data.formType == 2) {
-        params.rpType = Constants.rpType.payment 
+        params.rpType = Constants.rpType.payment
         // 2 付款单，
         params.objectId = this.data.form.objInfo.supId  // 供应商
         // 收款金额					
         params.sumAmtPay = Number(form.sumAmount)
+
         // 合计应付冲抵金额								
         params.sumAmtPayableHandle = form.currentPayableResidue
         // 合计优惠金额
         params.sumWaiveAmt = form.sumWaiveAmt
+        // 预付抵扣
+        params.sumUsePaymentResidue = form.paymentResidue
+        // 待核销金额
+        params.sumShouldHandle = form.payableResidue
+
         let rlsit = this.setReturnPayableList(form.payableList || [], form.sumWaiveAmt, form.currentPayableResidue, form.payableResidue)
         params.payableList = rlsit //应付款的明细 
 
@@ -272,7 +281,7 @@ mixins: [mixins],
             res.amtRec = res.sumAmount
           })
           itemList = tableData
-        } else{
+        } else {
           tableData.forEach(item => {
             itemList.push(
               {
@@ -285,7 +294,7 @@ mixins: [mixins],
             )
           })
         }
-       
+
         params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())
       } else if (this.data.formType == 4) {
         //客户退款保存参数
@@ -318,10 +327,12 @@ mixins: [mixins],
         params.sumAmtRec = Number(form.sumAmount)
         // 合计应收冲抵金额								
         params.sumAmtReceivableHandle = form.currentReceivableResidue
-        // 预存的使用
-        params.receiptResidue = form.receiptResidue
         // 合计优惠金额
         params.sumWaiveAmt = form.sumWaiveAmt
+        // 预存抵扣
+        params.sumUseReceiptResidue = formData.receiptResidue
+        // 待核销金额
+        params.sumShouldHandle = formData.receivableResidue
         let rlsit = this.setReturnReceivableList(form.receivableList || [], form.sumWaiveAmt, form.currentReceivableResidue, form.receivableResidue)
         params.receivableList = rlsit //应收收款的明细 
         tableData.forEach(item => {
@@ -338,14 +349,19 @@ mixins: [mixins],
 
       } else if (this.data.formType == 6) {
         // 6 退付款单，
-        params.rpType = Constants.rpType.returnPayment 
+        params.rpType = Constants.rpType.returnPayment
         params.objectId = this.data.form.objInfo.objectId  // 供应商
         // 收款金额					
         params.sumAmtPay = Number(form.sumAmount)
+
         // 合计应付冲抵金额								
         params.sumAmtPayableHandle = form.currentPayableResidue
         // 合计优惠金额
         params.sumWaiveAmt = form.sumWaiveAmt
+        // 预付抵扣
+        params.sumUsePaymentResidue = form.paymentResidue
+        // 待核销金额
+        params.sumShouldHandle = form.payableResidue
         let rlsit = this.setReturnPayableList(form.payableList || [], form.sumWaiveAmt, form.currentPayableResidue, form.payableResidue)
         params.payableList = rlsit //应付款的明细 
 
@@ -372,7 +388,7 @@ mixins: [mixins],
         params.remarks = formData.remarks  // 备注
         params.makeStaff = app.globalData.user.staffId  // 制单人  
         let itemNumber = 0
-              //收入类别list
+        //收入类别list
         formData.itemList.forEach(element => {
           if (!isNaN(element.amtReceivable)) { //是数字才能加减
             itemNumber = Number(itemNumber) + Number(element.amtReceivable)
@@ -382,13 +398,13 @@ mixins: [mixins],
           item.amtReceivable = element.amtReceivable //收入金额  
           itemList.push(item)
         });
-         
+
         let receiptList = []
         //收款方式list
         tableData.forEach(item => {
           receiptList.push(
             {
-              amtRec: item.sumAmount, 
+              amtRec: item.sumAmount,
               macCode: item.macCode,
               macId: item.macId,
               macName: item.macName,
@@ -397,9 +413,9 @@ mixins: [mixins],
         })
         params.receiptList = receiptList
         params.sumAmtReceivable = itemNumber //合计应收
-        params.sumAmtRec = formData.sumAmount 
+        params.sumAmtRec = formData.sumAmount
       } else if (this.data.formType == 8) { //订单开单收款
-
+        let formData = JSON.parse(this.data.formData)
         params.sumAmtRec = Number(params.sumAmtRec)
 
         tableData.forEach(item => {
@@ -415,7 +431,8 @@ mixins: [mixins],
         })
         params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())
         params.receiptList = itemList
-        params.sumAmtPay = formData.sumAmount 
+        console.log('formData',formData)
+        params.sumAmtPay = formData.sumAmount
         console.log('params', params)
       } else if (this.data.formType == 9) { //其他支出
         let formData = JSON.parse(this.data.formData)
@@ -439,12 +456,12 @@ mixins: [mixins],
           itemList.push(item)
         });
         params.sumAmtPayable = itemNumber
-        params.sumAmtPay = formData.sumAmount 
+        params.sumAmtPay = formData.sumAmount
         let paymentList = []
         tableData.forEach(item => {
           paymentList.push(
             {
-              amtPay: item.sumAmount, 
+              amtPay: item.sumAmount,
               macCode: item.macCode,
               macId: item.macId,
               macName: item.macName,

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

@@ -522,18 +522,19 @@ Page({
         this.setData({
           routeObjName: 'common',
           method: 'getInventory',
-          title: 'staffName',
+          title: 'skuName',
           contentList: [
             {
+              name: 'skuCode',
+              title: '商品编码'
+            },
+            {
               name: 'whName',
-              title: '仓库名称'
-            }, {
-              name: 'skuName',
-              title: '商品名称'
+              title: '库区'
             },
             {
-              name: 'skuCode',
-              title: '商品编码'
+              name: 'nonStdCode',
+              title: '非标号'
             },
             {
               name: 'usableQty',
@@ -543,6 +544,16 @@ Page({
               name: 'invQty',
               title: '库存量'
             },
+            {
+              name: 'outingQty',
+              title: '占库量'
+            },
+            {
+              name: 'freezeQty',
+              title: '冻结量'
+            },
+          
+            
 
           ],
           placeholder: ['whName']

package-base-select/pages/select-goods/select-goods.wxml

@@ -25,7 +25,7 @@
 
 
 <van-sticky offset-top="{{ 0 }}">
-  <van-nav-bar title="选择商品" left-text="" left-arrow="{{true}}" bind:click-left="onClickLeft" />
+  <van-nav-bar title="选择商品" left-text="" border="{{false}}" left-arrow="{{true}}" bind:click-left="onClickLeft" />
   <view style="display: flex;">
     <view style="width: 85%;">
       <van-search border="{{false}}" bind:search="doSearch" custom-class="search-class" bind:change="onSearchText" model:value="{{ searchText }}" placeholder="输入商品名/商品编码/唯一编码" use-right-icon-slot="{{true}}" placeholder-style="color:#95A8CB">
@@ -117,7 +117,7 @@
             <view class="table-content-row">
               <view style="display:flex;width:100%;">
                 <view data-item="{{item}}" style="display:flex;font-size: 15px;">
-                  <dk-text style="font-size:30rpx;" fontWeight="nomal" value="{{item.skuCode}}"></dk-text>
+                  <dk-text style="font-size:30rpx;" fontWeight="nomal" value="{{item.skuName}}"></dk-text>
                 </view>
               </view>
             </view>
@@ -127,10 +127,10 @@
               <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.skuName}}"></dk-text>
+                    <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="商品编码" copyValue="{{item.skuCode}}"></dk-text>
                   </view>
                   <view class="table-content-class">
-                    {{item.skuName?item.skuName:''}}
+                    {{item.skuCode?item.skuCode:''}}
                   </view>
                 </view>
               </view>
@@ -290,12 +290,12 @@
 
 
 
-<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' }}" type="sale"   descCol="skuModel"titleTagCol="shortName" titleCol="skuModel" priceCol="pricePromotion" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="参考价："  priceCol="pricePurchase" contentObj="{{popContent}}" bind:commit="editItems">
+<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' }}" type="sale"   descCol="skuName" titleTagCol="shortName" titleCol="skuModel" priceCol="pricePromotion" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="参考价："  priceCol="pricePurchase" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>
 
 
 
-<dk-popup wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="brandName" subCol="skuCode" descCol="skuModel" titleCol="skuName" priceTitle="标价：" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems">
+<dk-popup wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="shortName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>
 
 <dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="brandName" subCol="skuCode" descCol="skuModel" titleCol="skuName" priceTitle="标价：" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems" popupTopObj="{{popupTopObj}}">

package-basic-data/pages/customer-follow-up/customer-follow-up.js

@@ -21,7 +21,7 @@ Page({
     routeObjName: 'cusFollow',
     cardList: ['main'],
     buttonSaveList: [{ code: 'add', title: mixins.$t('save'), width: '120rpx' }],
-    id:'10112024-0407-0000-0000-0000296189a7',
+    id: '10112024-0407-0000-0000-0000296189a7',
     contentObj: {
       main: [
         { code: 'cusName', type: 'str', required: true, title: mixins.$t('customerName') },
@@ -29,12 +29,55 @@ Page({
         { code: 'addressFull', type: 'address', title: mixins.$t('addressFull'), required: false },
         { code: 'addressNo', type: 'str', required: false, title: mixins.$t('addressNo') },
         { code: 'intention', name: 'intentionName', type: 'drop', required: true, dropType: 'customerIntention', title: mixins.$t('intention') },
+        { code: 'followType', name: 'followTypeName', type: 'textarea', dropType: 'followType', type: 'drop', required: true, title: mixins.$t('followType') },
         { code: 'followData', type: 'textarea', required: true, title: mixins.$t('followData') },
         { code: 'nextFollowTime', type: 'dateTime', required: true, title: mixins.$t('nextFollowTime') },
         { code: 'stayTimeLen', name: 'stayTimeLenName', required: true, title: mixins.$t('stayTimeLen'), dropType: 'storeRetentionTime', type: 'drop', },
       ],
     },
   },
+  chooseData(e) {
+
+    let code = e.detail.code
+    if (code == 'followType') {
+      let formData = JSON.parse(this.data.formData)
+      let contentObj = this.data.contentObj
+      //电话、微信时留店时长是非必输
+  
+      contentObj.main.forEach(res => {
+        if (res.code == 'stayTimeLen') {
+          if (formData.followType == '跟进方式-电话' || formData.followType == '跟进方式-微信') {
+            res.required = false
+          } else {
+            res.required = true
+          }
+        }
+      })
+      this.setData({
+        contentObj:contentObj
+      })
+    }
+
+    if (code == 'inviteResult') {
+      let formData = JSON.parse(this.data.formData)
+      let contentObj = this.data.contentObj
+      contentObj.main.forEach(res => {
+        if (res.code == 'inviteTime') {
+          if(formData.inviteResult){
+            res.required = true
+          }else{
+            res.required = false
+          }
+        }
+      })
+    
+
+      this.setData({
+        contentObj:contentObj
+      })
+    }
+    
+  },
   /**
   * @desc : 设置保存参数
   * @date : 2024/2/1 15:49
@@ -113,21 +156,7 @@ Page({
       formData: JSON.stringify(data)
     })
   },
-  /**
- * @desc : 保存处理
- * @date : 2024/2/1 15:49
- * @author : 于继渤
- */
-  handleData() {
-    let pages = getCurrentPages();
-    let prevPage = pages[pages.length - 3]; //上二页
-    prevPage.setData({
-      refreshByAdd: true
-    })
-    wx.navigateBack({
-      data: 2
-    })
-  },
+
 
   /**
  * @desc : 顶部选择
@@ -177,7 +206,7 @@ Page({
    * @author : 于继渤
    */
   setCus(formData, item) {
-    // formData.cusId = item.cusId
+    formData.cusId = item.cusId ? item.cusId : null
     formData.cusName = item.cusName
     formData.cusCode = item.cusCode
     formData.cusPhone = item.cusPhone
@@ -210,21 +239,22 @@ Page({
       { code: 'addressFull', type: 'address', title: mixins.$t('addressFull'), required: false },
       { code: 'addressNo', type: 'str', required: false, title: mixins.$t('addressNo') },
       { code: 'intention', name: 'intentionName', type: 'drop', required: true, dropType: 'customerIntention', title: mixins.$t('intention') },
-
+      { code: 'followType', name: 'followTypeName', type: 'textarea', dropType: 'followType', type: 'drop', required: true, title: mixins.$t('followType') },
       { code: 'followData', type: 'textarea', required: true, title: mixins.$t('followData') },
       { code: 'nextFollowTime', type: 'dateTime', required: true, title: mixins.$t('nextFollowTime') },
       { code: 'stayTimeLen', name: 'stayTimeLenName', required: true, title: mixins.$t('stayTimeLen'), dropType: 'storeRetentionTime', type: 'drop', },
     ]
 
     let radioFollowUpList11 = [
-      { code: 'cusName', type: 'str', required: false, title: mixins.$t('customerName'),readonly:true },
-      { code: 'cusPhone', type: 'str', required: false, title: mixins.$t('cusPhone') ,readonly:true },
-      { code: 'addressFull', type: 'str', required: false, title: mixins.$t('addressFull'),readonly:true  },
-      { code: 'addressNo', type: 'str', required: false, title: mixins.$t('addressNo'),readonly:true  },
-      { code: 'intentionName', type: 'str', required: false, title: mixins.$t('intention'),readonly:true  },
-      { code: 'followData', type: 'textarea', required: false, title: mixins.$t('followData'),readonly:true  },
-      { code: 'nextFollowTime', type: 'str', required: false, title: mixins.$t('nextFollowTime'),readonly:true  },
-      { code: 'stayTimeLenName', type: 'str', required: false, title: mixins.$t('stayTimeLen'),readonly:true  },
+      { code: 'cusName', type: 'str', required: false, title: mixins.$t('customerName'), readonly: true },
+      { code: 'cusPhone', type: 'str', required: false, title: mixins.$t('cusPhone'), readonly: true },
+      { code: 'addressFull', type: 'str', required: false, title: mixins.$t('addressFull'), readonly: true },
+      { code: 'addressNo', type: 'str', required: false, title: mixins.$t('addressNo'), readonly: true },
+      { code: 'intentionName', type: 'str', required: false, title: mixins.$t('intention'), readonly: true },
+      { code: 'followData', type: 'textarea', required: false, title: mixins.$t('followData'), readonly: true },
+      { code: 'followName', type: 'textarea', required: false, title: mixins.$t('followType'), readonly: true },
+      { code: 'nextFollowTime', type: 'str', required: false, title: mixins.$t('nextFollowTime'), readonly: true },
+      { code: 'stayTimeLenName', type: 'str', required: false, title: mixins.$t('stayTimeLen'), readonly: true },
     ]
     let radioFollowUpList2 = [
       { code: 'cusName', type: 'str', required: true, title: mixins.$t('customerName') },
@@ -232,21 +262,24 @@ Page({
       { code: 'addressFull', type: 'address', title: mixins.$t('addressFull'), required: false },
       { code: 'addressNo', type: 'str', required: false, title: mixins.$t('addressNo') },
       { code: 'inviteResult', name: 'inviteResultName', type: 'drop', required: true, dropType: 'inviteResult', title: mixins.$t('inviteResult') },
-      { code: 'inviteTime', type: 'dateTime', required: true, title: mixins.$t('inviteResult') },
+      { code: 'inviteTime', type: 'dateTime', required: false, title: mixins.$t('inviteTime') },
       { code: 'intention', name: 'intentionName', type: 'drop', required: true, dropType: 'customerIntention', title: mixins.$t('intention') },
+      { code: 'followType', name: 'followTypeName', type: 'textarea', dropType: 'followType', type: 'drop', required: true, title: mixins.$t('followType') },
       { code: 'followData', type: 'textarea', required: true, title: mixins.$t('followData') },
       { code: 'nextFollowTime', type: 'dateTime', required: true, title: mixins.$t('nextFollowTime') },
     ]
     let radioFollowUpList22 = [
-      { code: 'cusName', type: 'str', required: false, title: mixins.$t('customerName'),readonly:true },
-      { code: 'cusPhone', type: 'str', required: false, title: mixins.$t('cusPhone') ,readonly:true },
-      { code: 'addressFull', type: 'str', required: false, title: mixins.$t('addressFull'),readonly:true  },
-      { code: 'addressNo', type: 'str', required: false, title: mixins.$t('addressNo'),readonly:true  },
-      { code: 'inviteResult', type: 'str', required: false, title: mixins.$t('inviteResult'),readonly:true  },
-      { code: 'inviteTime', type: 'str', required: false, title: mixins.$t('inviteTime'),readonly:true  },
-      { code: 'intentionName', type: 'str', required: false, title: mixins.$t('intention'),readonly:true  },
-      { code: 'followData', type: 'textarea', required: false, title: mixins.$t('followData'),readonly:true  },
-      { code: 'nextFollowTime', type: 'str', required: false, title: mixins.$t('nextFollowTime'),readonly:true  },
+      { code: 'cusName', type: 'str', required: false, title: mixins.$t('customerName'), readonly: true },
+      { code: 'cusPhone', type: 'str', required: false, title: mixins.$t('cusPhone'), readonly: true },
+      { code: 'addressFull', type: 'str', required: false, title: mixins.$t('addressFull'), readonly: true },
+      { code: 'addressNo', type: 'str', required: false, title: mixins.$t('addressNo'), readonly: true },
+      { code: 'inviteResult', type: 'str', required: false, title: mixins.$t('inviteResult'), readonly: true },
+      { code: 'inviteTime', type: 'str', required: false, title: mixins.$t('inviteTime'), readonly: true },
+      { code: 'intentionName', type: 'str', required: false, title: mixins.$t('intention'), readonly: true },
+      { code: 'followName', type: 'textarea', required: false, title: mixins.$t('followType'), readonly: true },
+      
+      { code: 'followData', type: 'textarea', required: false, title: mixins.$t('followData'), readonly: true },
+      { code: 'nextFollowTime', type: 'str', required: false, title: mixins.$t('nextFollowTime'), readonly: true },
     ]
     let radioFollowUpList3 = [
       { code: 'cusName', type: 'str', required: true, title: mixins.$t('customerName') },
@@ -261,29 +294,29 @@ Page({
 
     ]
     let radioFollowUpList33 = [
-      { code: 'cusName', type: 'str', required: false, title: mixins.$t('customerName'),readonly:true },
-      { code: 'cusPhone', type: 'str', required: false, title: mixins.$t('cusPhone') ,readonly:true },
-      { code: 'addressFull', type: 'str', required: false, title: mixins.$t('addressFull'),readonly:true  },
-      { code: 'addressNo', type: 'str', required: false, title: mixins.$t('addressNo'),readonly:true  },
-      { code: 'designStaffName', type: 'str', required: false, title: mixins.$t('designStaff'),readonly:true  },
-   
-      { code: 'inviteResultName', type: 'str', required: false, title: mixins.$t('inviteResult'),readonly:true  },
+      { code: 'cusName', type: 'str', required: false, title: mixins.$t('customerName'), readonly: true },
+      { code: 'cusPhone', type: 'str', required: false, title: mixins.$t('cusPhone'), readonly: true },
+      { code: 'addressFull', type: 'str', required: false, title: mixins.$t('addressFull'), readonly: true },
+      { code: 'addressNo', type: 'str', required: false, title: mixins.$t('addressNo'), readonly: true },
+      { code: 'designStaffName', type: 'str', required: false, title: mixins.$t('designStaff'), readonly: true },
+
+      { code: 'inviteResultName', type: 'str', required: false, title: mixins.$t('inviteResult'), readonly: true },
 
-      { code: 'followTime', type: 'str', required: false, title: mixins.$t('nextFollowTimeS'),readonly:true  },
-      { code: 'followData', type: 'textarea', required: false, title: mixins.$t('followData'),readonly:true  },
-      { code: 'nextFollowTime', type: 'str', required: false, title: mixins.$t('nextFollowTime'),readonly:true  },
+      { code: 'followTime', type: 'str', required: false, title: mixins.$t('nextFollowTimeS'), readonly: true },
+      { code: 'followData', type: 'textarea', required: false, title: mixins.$t('followData'), readonly: true },
+      { code: 'nextFollowTime', type: 'str', required: false, title: mixins.$t('nextFollowTime'), readonly: true },
 
     ]
     let contentObj = this.data.contentObj
     // let radioFollowUp = this.data.radioFollowUp
     if (radioFollowUp == '1') {
-      contentObj.main = this.data.formType == 'detail' ? radioFollowUpList11:radioFollowUpList1 
+      contentObj.main = this.data.formType == 'detail' ? radioFollowUpList11 : radioFollowUpList1
     }
     if (radioFollowUp == '2') {
-      contentObj.main =  this.data.formType == 'detail' ? radioFollowUpList22:radioFollowUpList2
+      contentObj.main = this.data.formType == 'detail' ? radioFollowUpList22 : radioFollowUpList2
     }
     if (radioFollowUp == '3') {
-      contentObj.main =  this.data.formType == 'detail' ? radioFollowUpList33:radioFollowUpList3
+      contentObj.main = this.data.formType == 'detail' ? radioFollowUpList33 : radioFollowUpList3
     }
     this.setData({
       contentObj: contentObj

package-basic-data/pages/customer-list/add/add.js

@@ -17,6 +17,7 @@ Page({
    */
   data: {
     routeObjName: 'customer',
+    saleChannelService: app.globalData['saleChannelService'],
     cardList: ['main', 'center', 'remarks'],
     buttonSaveList: [{ code: 'add', title: mixins.$t('save'), width: '120rpx' }],
     contentObj: {
@@ -32,10 +33,10 @@ Page({
       center: [
         { code: 'channelId', name: 'channelName', required: true, title: mixins.$t('saleChannel'), type: 'choose', urlKey: 'chooseChannel' },
 
-       
+
         { code: 'staffId', name: 'staffName', type: 'choose', required: true, title: mixins.$t('saleStaff'), urlKey: 'chooseStaff' },
         { code: 'orgId', name: 'orgName', type: 'choose', required: true, title: mixins.$t('saleOrg'), urlKey: 'chooseOrg' },
-        { code: 'initialDebt', type: 'number', required: false, title:'初始欠款' },
+        { code: 'initialDebt', type: 'number', required: false, title: '初始欠款' },
 
 
       ],
@@ -63,18 +64,18 @@ Page({
       formData.orgId = data.id
       formData.orgName = data.name
     }
-      //销售渠道
-      if (code == 'channelId') {
-        formData.channelId = data.id
-        formData.channelCode = data.code
-        formData.channelName = data.name
-      }
-      //客户来源
-      if (code == 'cusFrom') {
-        formData.cusFrom = data.id
-        formData.cusFromCode = data.code
-        formData.cusFromName = data.name
-      }
+    //销售渠道
+    if (code == 'channelId') {
+      formData.channelId = data.id
+      formData.channelCode = data.code
+      formData.channelName = data.name
+    }
+    //客户来源
+    if (code == 'cusFrom') {
+      formData.cusFrom = data.id
+      formData.cusFromCode = data.code
+      formData.cusFromName = data.name
+    }
     this.setData({
       formData: JSON.stringify(formData)
     })
@@ -112,6 +113,35 @@ Page({
       formData: JSON.stringify(data)
     })
   },
+
+  /**
+  * @desc : 设置销售渠道/人员/业务部门
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
+  getDefChannel() {
+    this.excute(this.data.saleChannelService, this.data.saleChannelService.selectByCond, {
+      flgDefault: true
+    }).then(res => {
+      if (res.data.code == 200) {
+        let formData = JSON.parse(this.data.formData)
+        if (res.data.data.list && res.data.data.list.length > 0) {
+          formData.channelId = res.data.data.list[0].channelId
+          formData.channelName = res.data.data.list[0].channelName
+          formData.channelCode = res.data.data.list[0].channelCode
+        }
+        formData.staffId = app.globalData.user.staffId
+        formData.staffName = app.globalData.user.staffName
+        formData.orgId = app.globalData.user.orgId
+        formData.orgName = app.globalData.user.orgName
+        //设置默认值
+        this.setData({
+          formData: JSON.stringify(formData)
+        })
+      }
+    })
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
@@ -121,6 +151,9 @@ Page({
       wx.setNavigationBarTitle({
         title: mixins.$t('editCus'),
       })
+    } else {
+      //设置默认值
+      this.getDefChannel()
     }
   },
 

package-basic-data/pages/customer-list/detail/detail.js

@@ -20,11 +20,17 @@ Page({
   data: {
     // 路由
     routeObjName: 'customer',
-    imageUrl:config.image_url + '/static/img/',
+    imageUrl: config.image_url + '/static/img/',
     cusFollowService: app.globalData['cusFollowService'],
+    orderService: app.globalData['orderService'],
+    cusReceiptPaymentService: app.globalData['cusReceiptPaymentService'],
     item: {},
     customerFollowList: [],
+    paymentRecordsList: [],
+    refundRecordsList: [],
+    orderList: [],
     active: 0,
+    activeCard: 0,
     // 主键Id
     primaryKey: 'cusId',
   },
@@ -104,5 +110,68 @@ Page({
       item: data
     })
     this.getCusFollowList(data.cusId)
-  }
+    this.getPayRecords(data.cusId, '收付款类型-收款')
+    this.getPayRecords(data.cusId, '收付款类型-退收款')
+  },
+
+  /**
+   * @desc : 跳转
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  toJump(e) {
+    let key = e.currentTarget.dataset.key
+    let url = null
+
+    if (key == 'sale') {
+      url = this.data.route.toSaleOrder.url
+    }
+    if (key == 'receipt') {
+      url = this.data.route.collection.url
+    }
+    if (key == 'saleReturn') {
+      url = this.data.route.toSaleOrderReturn.url
+
+    }
+    let that = this
+    wx.navigateTo({
+      url: url,
+      events: {
+        // 保存成功后刷新页面
+        refresh: function (data) {
+        }
+      },
+      success: function (res) {
+        res.eventChannel.emit('params', { id: that.data.item.cusId, formMode: 'index' });
+      }
+    })
+  },
+
+
+  /**
+   * @desc : 收款记录
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  getPayRecords(cusId, type) {
+    let params = {}
+    params.objectId = cusId
+    params.rpTypeList = [type]
+    this.excute(this.data.cusReceiptPaymentService, this.data.cusReceiptPaymentService.selectByCond, params).then(res => {
+      if (res.data.code == 200) {
+        if (type == '收付款类型-收款') {
+          this.setData({
+            paymentRecordsList: res.data.data.list
+          })
+        } else {
+          this.setData({
+            refundRecordsList: res.data.data.list
+          })
+        }
+
+      }
+    })
+  },
+
+
 })

package-basic-data/pages/customer-list/detail/detail.wxml

@@ -41,7 +41,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.orderAmount}}"></dk-cell>
+          <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.orderAmount ? item.orderAmount : 0}}"></dk-cell>
         </view>
         <view class="oreder-summary-detail">
           订单（{{item.orderQuantity}}单）
@@ -50,7 +50,7 @@
 
       <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.outboundAmount}}"></dk-cell>
+          <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.outboundAmount ? item.outboundAmount : 0}}"></dk-cell>
         </view>
         <view class="oreder-summary-detail">
           出库（{{item.outboundQuantity}}单）
@@ -59,17 +59,17 @@
 
       <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="{{9999}}"></dk-cell>
+          <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.outboundNotAmount ? item.outboundNotAmount : 0}}"></dk-cell>
         </view>
         <view class="oreder-summary-detail">
-          未出库
+          未出库（{{item.outboundNotQuantity}}单）
         </view>
       </view>
     </view>
     <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="{{9999}}"></dk-cell>
+          <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>
         </view>
         <view class="oreder-summary-detail">
           收款总额
@@ -78,7 +78,7 @@
 
       <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="{{9999}}">
+          <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>
         </view>
         <view class="oreder-summary-detail">
@@ -88,10 +88,10 @@
 
       <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="{{9999}}"></dk-cell>
+          <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.outboundReturnAmount ? item.outboundReturnAmount : 0 }}"></dk-cell>
         </view>
         <view class="oreder-summary-detail">
-          退货（{{SumDataList.rejectQuantity}}单）
+          退货（{{item.outboundReturnQuantity}}单）
         </view>
       </view>
     </view>
@@ -100,19 +100,19 @@
 
 <van-cell border="{{ false }}">
   <view style=" display:flex;height: 102rpx;width:100%;">
-    <view class="order-button" style="background: linear-gradient(76.18deg, #87B8F1 5.1%, #F0F5FF 88.86%);border: 1px solid #8BBAF2;position: relative;" bindtap="toChooseGoods" data-item="{{form}}">
+    <view class="order-button" style="background: linear-gradient(76.18deg, #87B8F1 5.1%, #F0F5FF 88.86%);border: 1px solid #8BBAF2;position: relative;" bindtap="toJump" data-key="sale">
       <image class="scan-image-icon-3" fit="fill" src="{{imageUrl+'/customer_detail_icon_02.png'}}"></image>
       <view style="color:#0458C0;font-weight:bold;font-size: 14px;z-index: 2;">
         销售订单
       </view>
     </view>
-    <view class="order-button" style="background: linear-gradient(76.18deg, #87A5F1 5.1%, #F0F5FF 88.86%);border: 1px solid #8DAAF2;margin-left: 23rpx;position: relative;" bindtap="toCollectionAdd" data-item="{{form}}">
+    <view class="order-button" style="background: linear-gradient(76.18deg, #87A5F1 5.1%, #F0F5FF 88.86%);border: 1px solid #8DAAF2;margin-left: 23rpx;position: relative;" bindtap="toJump" data-key="receipt">
       <image class="scan-image-icon-3" fit="fill" src="{{imageUrl+'/customer_detail_icon_01.png'}}"></image>
       <view style="color:#253FC9;font-weight:bold;font-size: 14px;z-index: 2;">
         收款单
       </view>
     </view>
-    <view class="order-button" style="background: linear-gradient(76.18deg, #7BCDEF 5.1%, #F0FDFF 88.86%);border: 1px solid #85D1F1;margin-left: 23rpx;position: relative;" bindtap="toSelectOrder" data-item="{{form}}">
+    <view class="order-button" style="background: linear-gradient(76.18deg, #7BCDEF 5.1%, #F0FDFF 88.86%);border: 1px solid #85D1F1;margin-left: 23rpx;position: relative;" bindtap="toJump" data-key="saleReturn">
       <image class="scan-image-icon-3" fit="fill" src="{{imageUrl+'/customer_detail_icon_03.png'}}"></image>
       <view style="color:#0B8DB7;font-weight:bold;font-size: 14px;z-index: 2;">
         销售退货
@@ -206,293 +206,76 @@
 
 
   <van-tab title-style="color:#96A7C5;" title="交易记录">
-  </van-tab>
-  <view wx:if="{{active == 1}}">
-
-    <view style="margin-bottom: 15rpx;"></view>
-    <van-tabs type="card" border="{{false}}" active="{{ activeCard }}" bind:change="changeTag" tab-active-class="{{activeCard==0?'van-tab-active-left':(activeCard==2?'van-tab-active-right':'van-tab-active-middle')}}">
-      <van-tab title="预算报价">
-
-
-      </van-tab>
-
-      <van-tab title="成交订单">
-
-
-      </van-tab>
-
-      <van-tab title="销售退货">
-
-      </van-tab>
-    </van-tabs>
-
-    <view wx:if="{{activeCard == 0}}">
-      <view wx:for="{{orderList_price}}" data-index="{{index}}" data-item="item">
-
-        <view class="dk-card-outer-class">
-          <view class="dk-card-class">
-            <view style="display:flex;padding: 2vw;">
-              <image style="width:48rpx;height:48rpx;align-self:center;margin: 16rpx;" src="{{imageUrl + 'customer-assignment.png'}}"></image>
-              <view style="font-weight:bold;font-size: 13px;white-space:nowrap;align-self:center;">{{item.orderNo}}
-              </view>
-            </view>
-
-            <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
-            <view style="display:flex;font-size: 26rpx;">
-              <view style="margin:2vw;margin-left: 32rpx;">门店:{{item.orgName}}</view>
-              <view style="flex:1;text-align:right;margin: 2vw;margin-right: 32rpx;white-space:nowrap;">
-                导购:{{item.staffName}}</view>
-            </view>
-            <van-grid column-num="3">
-              <view style="display: flex;background-color:white;">
-                <view class="number-out-order">
-                  <view class="order-summary">
-                    <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumAmount}}"></dk-cell>
-                  </view>
-                  <view class="out-oreder-detail">
-                    报价金额
-                  </view>
-                </view>
-
-                <view class="number-out-order">
-                  <view class="order-summary">
-                    <dk-text fontSize="17" color="#1B365D" value="{{item.categoryQuantity}}">
-                    </dk-text>
-                  </view>
-                  <view class="out-oreder-detail">
-                    品类数
-                  </view>
-                </view>
-
-                <view class="number-out-order">
-                  <view class="order-summary">
-                    <dk-text fontSize="17" color="#1B365D" value="{{item.sumQuantity}}">
-                    </dk-text>
-                  </view>
-                  <view class="out-oreder-detail">
-                    产品件数
-                  </view>
-                </view>
-              </view>
-            </van-grid>
-
-            <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
-            <van-collapse value="{{ activeNames_goods }}" bind:change="onChange_goods">
-              <van-collapse-item name="{{index+1}}" value="展开">
-                <view slot="title">
-                  <view style="display: flex;">
-                    <view>商品明细</view>
-                    <view style="color:#b9b9b9;font-size:10px;flex:1;text-align-last: right;"></view>
-                  </view>
-                </view>
-
-                <view wx:for="{{item.orderItemVOList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" wx:for-index="childindex" border="{{ true }}">
-
-                  <van-card data-item="{{item}}" data-index="{{index}}">
-
-                    <view slot="thumb">
-                      <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
-                    </view>
-                    <view slot="title" style="display: flex;">
-
-                      <view style="display: flex;">
-
-                        <dk-title titleTag="{{item.titleTag}}" title="{{item.title}}"></dk-title>
-                      </view>
-
-                      <view wx:if="{{item.flag}}" style="text-align: right;width: 30%;">
-                        <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">可换件</van-tag>
-                        <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">需设计</van-tag>
-                      </view>
-                    </view>
-
-                    <view slot="desc">
-                      <view style="display:flex;width: 100%;">
-                        <view style="width: 80%;">
-                          <dk-text fontWeight="nomal" value="{{item.desc}}"></dk-text>
-
-                        </view>
-
-                      </view>
-                    </view>
-                    <view slot="price">
-                      <view style="display: flex;width: 100%;flex-direction: row;">
-                        <view style="color: red;font-size: 4vw;width: 100%;">
-                          <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#CAA977" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item.priceSale ? item.priceSale : 0)}}"></dk-cell>
-                        </view>
-                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.itemQuantity}}</span></view>
-                      </view>
-                    </view>
-
-
-
-
-                    <view slot="footer">
-                      <view style="margin-top: 15rpx;" wx:if="{{item.bomItems.length > 0}}">
-                        <view style="width: 100%;display: flex;">
-                          <view style="font-size: 14px;width: 50%;text-align: left;color: #95A8CB;">
-                            明细
-                          </view>
-                          <view style="font-size: 14px;width: 50%;text-align: right;color: #95A8CB;" data-item="{{item}}" data-big="{{index}}" data-index="{{childindex}}" catchtap="onPriceOpenGoodsList">
-                            {{item.packageDetailsFlag ? '收起' :'展开'}}
-                            <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
-                          </view>
-                        </view>
-
-                        <view wx:if="{{item.packageDetailsFlag}}">
-
-                          <view wx:for="{{item.bomItems}}" data-item="{{item2}}" wx:for-item="item2" wx:key="index2">
-                            <view style="text-align: left;width: 100%; padding-left: 15rpx;padding-top:15rpx;">
-                              <view style="display: flex;">
-                                <view>
-                                  <van-image radius="5px" width="65" height="65" src="{{item2.iconThumPath }}" />
-                                </view>
-                                <view style="margin-left:5px;width: 66vw;">
-
-                                  <view style="display: flex;">
-
-
-                                    <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
-                                  </view>
-
-                                  <view style="display: flex;font-size:3.2vw; ">
-                                    <text decode>{{item2.skuName}}</text>
-                                  </view>
-
-                                  <view style="display: flex;font-size:3.2vw; ">
-                                    <text decode>{{' '}}</text>
-                                  </view>
-                                  <view slot="footer" style="width:100%;justify-content: flex-end;margin-top:20rpx;text-align:right;align-self: flex-end;">
-                                    <view style="display: flex;width: 100%;flex-direction: row;">
-                                      <view style="color: red;font-size: 4vw;width: 100%;text-align: left;">
-                                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#CAA977" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item2.priceSale)}}"></dk-cell>
-                                      </view>
-                                      <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item2.itemQuantity }}</span></view>
-                                    </view>
-                                  </view>
-                                </view>
-                              </view>
-                            </view>
-                          </view>
-
-                        </view>
-                      </view>
-                      <view class="hr"></view>
-                      <view style="display: flex;width: 100%;margin-top:5px;" data-index="{{index}}">
-                        <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
-                          备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
-                        </view>
-                        <!-- <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">金额：<span style="line-height:56rpx;color:#CAA977;">
-                            ￥{{ numberFormat.toThousandCents((item.priceSale ?
-                            item.priceSale : 0) * item.itemQuantity)}}</span></view> -->
-                      </view>
+    <view>
+      <!-- <van-tabs type="card" border="{{false}}" active="{{ activeCard }}" bind:change="changeTag" tab-active-class="{{activeCard==0?'van-tab-active-left':(activeCard==2?'van-tab-active-right':'van-tab-active-middle')}}">
+        <van-tab title="预算报价">
 
-                    </view>
 
-                  </van-card>
+        </van-tab>
 
-                  <van-divider />
-                </view>
+        <van-tab title="成交订单">
 
-              </van-collapse-item>
-            </van-collapse>
-
-          </view>
-        </view>
 
+        </van-tab>
 
-      </view>
-      <van-empty wx:if="{{orderList_price.length==0}}" description="暂无数据" />
-    </view>
+        <van-tab title="销售退货">
 
+        </van-tab>
+      </van-tabs> -->
 
+      <view wx:if="{{activeCard == 0}}">
+        <view wx:for="{{orderList}}" data-index="{{index}}" data-item="item">
 
-    <view wx:if="{{activeCard == 1}}">
-      <scroll-view scroll-y="true" style="height: 1300rpx;" bindscrolltolower="paging" scroll-top="{{topNum}}">
-        <view wx:for="{{orderList_ok}}" data-index="{{index}}" wx-key="index" data-item="item">
           <view class="dk-card-outer-class">
             <view class="dk-card-class">
               <view style="display:flex;padding: 2vw;">
                 <image style="width:48rpx;height:48rpx;align-self:center;margin: 16rpx;" src="{{imageUrl + 'customer-assignment.png'}}"></image>
-                <view style="width: 60%;">
-                  <view style="font-weight:bold;font-size: 26rpx;white-space:nowrap;">{{item.orderNo}}</view>
-
-                  <view style="font-size: 12px;color:#95A8CB;">{{wxmlUtil.format(item.makingTime)}}</view>
+                <view style="font-weight:bold;font-size: 13px;white-space:nowrap;align-self:center;">{{item.orderNo}}
                 </view>
-                <view style="width: 30%;display: flex;">
-                  <view style="font-size:13px;align-self:center;flex:1;text-align: right;color:#00A7B5;" bindtap="toOriginal_order" data-item="{{item}}">查看原单
-                    <van-icon name="arrow" />
-                  </view>
-                </view>
-
               </view>
 
               <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
               <view style="display:flex;font-size: 26rpx;">
-                <view style="margin:2vw;margin-left:32rpx;">门店:{{item.orgName}}</view>
-                <view style="flex:1;text-align:right;margin: 2vw;margin-right:32rpx;white-space:nowrap;">
+                <view style="margin:2vw;margin-left: 32rpx;">门店:{{item.orgName}}</view>
+                <view style="flex:1;text-align:right;margin: 2vw;margin-right: 32rpx;white-space:nowrap;">
                   导购:{{item.staffName}}</view>
               </view>
               <van-grid column-num="3">
                 <view style="display: flex;background-color:white;">
                   <view class="number-out-order">
                     <view class="order-summary">
-                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.tSumGoodsAmount}}"></dk-cell>
+                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumAmount}}"></dk-cell>
                     </view>
                     <view class="out-oreder-detail">
-                      订单金额
-                    </view>
-                  </view>
-                  <view class="number-out-order">
-                    <view class="order-summary">
-                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumOutAmount}}"></dk-cell>
-                    </view>
-                    <view class="out-oreder-detail">
-                      出库（1单）
-                    </view>
-                  </view>
-                  <view class="number-out-order">
-                    <view class="order-summary">
-                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.tSumGoodsAmount - item.sumOutAmount?item.tSumGoodsAmount - item.sumOutAmount:0}}">
-                      </dk-cell>
-                    </view>
-                    <view class="out-oreder-detail">
-                      未出库
-                    </view>
-                  </view>
-                </view>
-                <view style="display: flex;background-color:white;">
-                  <view class="number-out-order">
-                    <view class="order-summary">
-                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumReceiptAmount}}"></dk-cell>
-                    </view>
-                    <view class="out-oreder-detail">
-                      定金金额
+                      报价金额
                     </view>
                   </view>
+
                   <view class="number-out-order">
                     <view class="order-summary">
-                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.receivable}}"></dk-cell>
+                      <dk-text fontSize="17" color="#1B365D" value="{{item.categoryQuantity}}">
+                      </dk-text>
                     </view>
                     <view class="out-oreder-detail">
-                      订单欠款
+                      品类数
                     </view>
                   </view>
+
                   <view class="number-out-order">
                     <view class="order-summary">
-                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumRejectAmount}}"></dk-cell>
+                      <dk-text fontSize="17" color="#1B365D" value="{{item.sumQuantity}}">
+                      </dk-text>
                     </view>
                     <view class="out-oreder-detail">
-                      退货
+                      产品件数
                     </view>
                   </view>
                 </view>
-
               </van-grid>
 
               <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
               <van-collapse value="{{ activeNames_goods }}" bind:change="onChange_goods">
-                <van-collapse-item name="{{index+1}}" style="color:#95A8CB;border-color:15rpx;" value="展开">
+                <van-collapse-item name="{{index+1}}" value="展开">
                   <view slot="title">
                     <view style="display: flex;">
                       <view>商品明细</view>
@@ -534,7 +317,7 @@
                           <view style="color: red;font-size: 4vw;width: 100%;">
                             <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#CAA977" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item.priceSale ? item.priceSale : 0)}}"></dk-cell>
                           </view>
-                          <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.tItemQuantity}}</span></view>
+                          <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.itemQuantity}}</span></view>
                         </view>
                       </view>
 
@@ -547,7 +330,7 @@
                             <view style="font-size: 14px;width: 50%;text-align: left;color: #95A8CB;">
                               明细
                             </view>
-                            <view style="font-size: 14px;width: 50%;text-align: right;color: #95A8CB;" data-item="{{item}}" data-big="{{index}}" data-index="{{childindex}}" catchtap="onChangeOpenGoodsList">
+                            <view style="font-size: 14px;width: 50%;text-align: right;color: #95A8CB;" data-item="{{item}}" data-big="{{index}}" data-index="{{childindex}}" catchtap="onPriceOpenGoodsList">
                               {{item.packageDetailsFlag ? '收起' :'展开'}}
                               <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
                             </view>
@@ -565,6 +348,7 @@
 
                                     <view style="display: flex;">
 
+
                                       <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
                                     </view>
 
@@ -580,7 +364,7 @@
                                         <view style="color: red;font-size: 4vw;width: 100%;text-align: left;">
                                           <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#CAA977" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item2.priceSale)}}"></dk-cell>
                                         </view>
-                                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item2.tItemQuantity }}</span></view>
+                                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item2.itemQuantity }}</span></view>
                                       </view>
                                     </view>
                                   </view>
@@ -595,9 +379,9 @@
                           <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
                             备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
                           </view>
-                          <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">金额：<span style="line-height:56rpx;color:#CAA977;">￥{{ numberFormat.toThousandCents((item.priceSale
-                              ?
-                              item.priceSale : 0) * item.tItemQuantity)}}</span></view>
+                          <!-- <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">金额：<span style="line-height:56rpx;color:#CAA977;">
+                        ￥{{ numberFormat.toThousandCents((item.priceSale ?
+                        item.priceSale : 0) * item.itemQuantity)}}</span></view> -->
                         </view>
 
                       </view>
@@ -609,151 +393,367 @@
 
                 </van-collapse-item>
               </van-collapse>
+
             </view>
           </view>
-        </view>
-      </scroll-view>
 
-      <van-empty wx:if="{{orderList_ok.length==0}}" description="暂无数据" />
-    </view>
 
+        </view>
+        <van-empty wx:if="{{orderList.length==0}}" description="暂无数据" />
+      </view>
 
 
-    <view wx:if="{{activeCard == 2}}">
-      <view wx:for="{{orderList_out}}" data-index="{{index}}" data-item="item">
-        <view class="dk-card-outer-class">
-          <view class="dk-card-class">
-            <view style="display:flex;padding: 2vw;">
-              <image style="width:48rpx;height:48rpx;align-self:center;margin: 16rpx;" src="{{imageUrl + 'customer-assignment.png'}}"></image>
-              <view>
-                <view style="font-weight:bold;font-size: 26rpx;white-space:nowrap;">{{item.rejectNo}}</view>
-                <view style="font-size: 12px;color:#95A8CB;">{{wxmlUtil.format(item.makingTime)}}</view>
-              </view>
 
-            </view>
+      <view wx:if="{{activeCard == 1}}">
+        <scroll-view scroll-y="true" style="height: 1300rpx;" bindscrolltolower="paging" scroll-top="{{topNum}}">
+          <view wx:for="{{orderList_ok}}" data-index="{{index}}" wx-key="index" data-item="item">
+            <view class="dk-card-outer-class">
+              <view class="dk-card-class">
+                <view style="display:flex;padding: 2vw;">
+                  <image style="width:48rpx;height:48rpx;align-self:center;margin: 16rpx;" src="{{imageUrl + 'customer-assignment.png'}}"></image>
+                  <view style="width: 60%;">
+                    <view style="font-weight:bold;font-size: 26rpx;white-space:nowrap;">{{item.orderNo}}</view>
 
-            <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw" />
-            <view style="display:flex;font-size: 26rpx;">
-              <view style="margin:2vw;margin-left: 32rpx;">门店:{{item.orgName}}</view>
-              <view style="flex:1;text-align:right;margin: 2vw;margin-right: 32rpx;white-space:nowrap;">
-                导购:{{item.staffName}}</view>
-            </view>
-            <van-grid column-num="3">
-              <view style="display: flex;background-color:white;">
-                <view class="number-out-order">
-                  <view class="order-summary">
-                    <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumRejectAmount}}"></dk-cell>
+                    <view style="font-size: 12px;color:#95A8CB;">{{wxmlUtil.format(item.makingTime)}}</view>
                   </view>
-                  <view class="out-oreder-detail">
-                    退货金额
+                  <view style="width: 30%;display: flex;">
+                    <view style="font-size:13px;align-self:center;flex:1;text-align: right;color:#00A7B5;" bindtap="toOriginal_order" data-item="{{item}}">查看原单
+                      <van-icon name="arrow" />
+                    </view>
                   </view>
+
                 </view>
 
-                <view class="number-out-order">
-                  <view class="order-summary">
-                    <dk-text fontSize="17" color="#1B365D" value=" {{item.categoryQuantity}}">
-                    </dk-text>
+                <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
+                <view style="display:flex;font-size: 26rpx;">
+                  <view style="margin:2vw;margin-left:32rpx;">门店:{{item.orgName}}</view>
+                  <view style="flex:1;text-align:right;margin: 2vw;margin-right:32rpx;white-space:nowrap;">
+                    导购:{{item.staffName}}</view>
+                </view>
+                <van-grid column-num="3">
+                  <view style="display: flex;background-color:white;">
+                    <view class="number-out-order">
+                      <view class="order-summary">
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.tSumGoodsAmount}}"></dk-cell>
+                      </view>
+                      <view class="out-oreder-detail">
+                        订单金额
+                      </view>
+                    </view>
+                    <view class="number-out-order">
+                      <view class="order-summary">
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumOutAmount}}"></dk-cell>
+                      </view>
+                      <view class="out-oreder-detail">
+                        出库（1单）
+                      </view>
+                    </view>
+                    <view class="number-out-order">
+                      <view class="order-summary">
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.tSumGoodsAmount - item.sumOutAmount?item.tSumGoodsAmount - item.sumOutAmount:0}}">
+                        </dk-cell>
+                      </view>
+                      <view class="out-oreder-detail">
+                        未出库
+                      </view>
+                    </view>
                   </view>
-                  <view class="out-oreder-detail">
-                    品类数
+                  <view style="display: flex;background-color:white;">
+                    <view class="number-out-order">
+                      <view class="order-summary">
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumReceiptAmount}}"></dk-cell>
+                      </view>
+                      <view class="out-oreder-detail">
+                        定金金额
+                      </view>
+                    </view>
+                    <view class="number-out-order">
+                      <view class="order-summary">
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.receivable}}"></dk-cell>
+                      </view>
+                      <view class="out-oreder-detail">
+                        订单欠款
+                      </view>
+                    </view>
+                    <view class="number-out-order">
+                      <view class="order-summary">
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumRejectAmount}}"></dk-cell>
+                      </view>
+                      <view class="out-oreder-detail">
+                        退货
+                      </view>
+                    </view>
                   </view>
+
+                </van-grid>
+
+                <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
+                <van-collapse value="{{ activeNames_goods }}" bind:change="onChange_goods">
+                  <van-collapse-item name="{{index+1}}" style="color:#95A8CB;border-color:15rpx;" value="展开">
+                    <view slot="title">
+                      <view style="display: flex;">
+                        <view>商品明细</view>
+                        <view style="color:#b9b9b9;font-size:10px;flex:1;text-align-last: right;"></view>
+                      </view>
+                    </view>
+
+                    <view wx:for="{{item.orderItemVOList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" wx:for-index="childindex" border="{{ true }}">
+
+                      <van-card data-item="{{item}}" data-index="{{index}}">
+
+                        <view slot="thumb">
+                          <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
+                        </view>
+                        <view slot="title" style="display: flex;">
+
+                          <view style="display: flex;">
+
+                            <dk-title titleTag="{{item.titleTag}}" title="{{item.title}}"></dk-title>
+                          </view>
+
+                          <view wx:if="{{item.flag}}" style="text-align: right;width: 30%;">
+                            <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">可换件</van-tag>
+                            <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">需设计</van-tag>
+                          </view>
+                        </view>
+
+                        <view slot="desc">
+                          <view style="display:flex;width: 100%;">
+                            <view style="width: 80%;">
+                              <dk-text fontWeight="nomal" value="{{item.desc}}"></dk-text>
+
+                            </view>
+
+                          </view>
+                        </view>
+                        <view slot="price">
+                          <view style="display: flex;width: 100%;flex-direction: row;">
+                            <view style="color: red;font-size: 4vw;width: 100%;">
+                              <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#CAA977" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item.priceSale ? item.priceSale : 0)}}"></dk-cell>
+                            </view>
+                            <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.tItemQuantity}}</span></view>
+                          </view>
+                        </view>
+
+
+
+
+                        <view slot="footer">
+                          <view style="margin-top: 15rpx;" wx:if="{{item.bomItems.length > 0}}">
+                            <view style="width: 100%;display: flex;">
+                              <view style="font-size: 14px;width: 50%;text-align: left;color: #95A8CB;">
+                                明细
+                              </view>
+                              <view style="font-size: 14px;width: 50%;text-align: right;color: #95A8CB;" data-item="{{item}}" data-big="{{index}}" data-index="{{childindex}}" catchtap="onChangeOpenGoodsList">
+                                {{item.packageDetailsFlag ? '收起' :'展开'}}
+                                <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
+                              </view>
+                            </view>
+
+                            <view wx:if="{{item.packageDetailsFlag}}">
+
+                              <view wx:for="{{item.bomItems}}" data-item="{{item2}}" wx:for-item="item2" wx:key="index2">
+                                <view style="text-align: left;width: 100%; padding-left: 15rpx;padding-top:15rpx;">
+                                  <view style="display: flex;">
+                                    <view>
+                                      <van-image radius="5px" width="65" height="65" src="{{item2.iconThumPath }}" />
+                                    </view>
+                                    <view style="margin-left:5px;width: 66vw;">
+
+                                      <view style="display: flex;">
+
+                                        <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
+                                      </view>
+
+                                      <view style="display: flex;font-size:3.2vw; ">
+                                        <text decode>{{item2.skuName}}</text>
+                                      </view>
+
+                                      <view style="display: flex;font-size:3.2vw; ">
+                                        <text decode>{{' '}}</text>
+                                      </view>
+                                      <view slot="footer" style="width:100%;justify-content: flex-end;margin-top:20rpx;text-align:right;align-self: flex-end;">
+                                        <view style="display: flex;width: 100%;flex-direction: row;">
+                                          <view style="color: red;font-size: 4vw;width: 100%;text-align: left;">
+                                            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#CAA977" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item2.priceSale)}}"></dk-cell>
+                                          </view>
+                                          <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item2.tItemQuantity }}</span></view>
+                                        </view>
+                                      </view>
+                                    </view>
+                                  </view>
+                                </view>
+                              </view>
+
+                            </view>
+                          </view>
+                          <view class="hr"></view>
+                          <view style="display: flex;width: 100%;margin-top:5px;" data-index="{{index}}">
+                            <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
+                              备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
+                            </view>
+                            <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">金额：<span style="line-height:56rpx;color:#CAA977;">￥{{ numberFormat.toThousandCents((item.priceSale
+                                ?
+                                item.priceSale : 0) * item.tItemQuantity)}}</span></view>
+                          </view>
+
+                        </view>
+
+                      </van-card>
+
+                      <van-divider />
+                    </view>
+
+                  </van-collapse-item>
+                </van-collapse>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+
+        <van-empty wx:if="{{orderList_ok.length==0}}" description="暂无数据" />
+      </view>
+
+
+
+      <view wx:if="{{activeCard == 2}}">
+        <view wx:for="{{orderList_out}}" data-index="{{index}}" data-item="item">
+          <view class="dk-card-outer-class">
+            <view class="dk-card-class">
+              <view style="display:flex;padding: 2vw;">
+                <image style="width:48rpx;height:48rpx;align-self:center;margin: 16rpx;" src="{{imageUrl + 'customer-assignment.png'}}"></image>
+                <view>
+                  <view style="font-weight:bold;font-size: 26rpx;white-space:nowrap;">{{item.rejectNo}}</view>
+                  <view style="font-size: 12px;color:#95A8CB;">{{wxmlUtil.format(item.makingTime)}}</view>
                 </view>
 
-                <view class="number-out-order">
-                  <view class="order-summary">
-                    <dk-text fontSize="17" color="#1B365D" value=" {{item.sumRejectQuantity}}">
-                    </dk-text>
+              </view>
+
+              <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw" />
+              <view style="display:flex;font-size: 26rpx;">
+                <view style="margin:2vw;margin-left: 32rpx;">门店:{{item.orgName}}</view>
+                <view style="flex:1;text-align:right;margin: 2vw;margin-right: 32rpx;white-space:nowrap;">
+                  导购:{{item.staffName}}</view>
+              </view>
+              <van-grid column-num="3">
+                <view style="display: flex;background-color:white;">
+                  <view class="number-out-order">
+                    <view class="order-summary">
+                      <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#CAA977" fontWeight="600" title="" content="{{item.sumRejectAmount}}"></dk-cell>
+                    </view>
+                    <view class="out-oreder-detail">
+                      退货金额
+                    </view>
                   </view>
-                  <view class="out-oreder-detail">
-                    退货件数
+
+                  <view class="number-out-order">
+                    <view class="order-summary">
+                      <dk-text fontSize="17" color="#1B365D" value=" {{item.categoryQuantity}}">
+                      </dk-text>
+                    </view>
+                    <view class="out-oreder-detail">
+                      品类数
+                    </view>
                   </view>
-                </view>
-              </view>
-            </van-grid>
-
-            <van-collapse value="{{ activeNames_goods2 }}" bind:change="onChange_goods2">
-              <van-collapse-item name="{{index+1}}" style="color:#95A8CB;" value="展开">
-                <view slot="title">
-                  <view style="display: flex;">
-                    <view>商品明细</view>
-                    <view style="color:#b9b9b9;font-size:10px;flex:1;text-align-last: right;"></view>
+
+                  <view class="number-out-order">
+                    <view class="order-summary">
+                      <dk-text fontSize="17" color="#1B365D" value=" {{item.sumRejectQuantity}}">
+                      </dk-text>
+                    </view>
+                    <view class="out-oreder-detail">
+                      退货件数
+                    </view>
                   </view>
                 </view>
-                <view wx:for="{{item.rejectItemVOList}}" data-item="{{item}}" wx:key="index" border="{{ true }}" wx:for-index="childindex">
-
-                  <van-card data-item="{{item}}" data-index="{{index}}">
+              </van-grid>
 
-                    <view slot="thumb">
-                      <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
+              <van-collapse value="{{ activeNames_goods2 }}" bind:change="onChange_goods2">
+                <van-collapse-item name="{{index+1}}" style="color:#95A8CB;" value="展开">
+                  <view slot="title">
+                    <view style="display: flex;">
+                      <view>商品明细</view>
+                      <view style="color:#b9b9b9;font-size:10px;flex:1;text-align-last: right;"></view>
                     </view>
-                    <view slot="title" style="display: flex;">
+                  </view>
+                  <view wx:for="{{item.rejectItemVOList}}" data-item="{{item}}" wx:key="index" border="{{ true }}" wx:for-index="childindex">
 
-                      <view style="display: flex;">
+                    <van-card data-item="{{item}}" data-index="{{index}}">
 
-                        <dk-title titleTag="{{item.titleTag}}" title="{{item.title}}"></dk-title>
+                      <view slot="thumb">
+                        <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
                       </view>
+                      <view slot="title" style="display: flex;">
 
-                      <view wx:if="{{item.flag}}" style="text-align: right;width: 30%;">
-                        <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">可换件</van-tag>
-                        <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">需设计</van-tag>
-                      </view>
-                    </view>
+                        <view style="display: flex;">
 
-                    <view slot="desc">
-                      <view style="display:flex;width: 100%;">
-                        <view style="width: 80%;">
-                          <dk-text fontWeight="nomal" value="{{item.desc}}"></dk-text>
+                          <dk-title titleTag="{{item.titleTag}}" title="{{item.title}}"></dk-title>
+                        </view>
 
+                        <view wx:if="{{item.flag}}" style="text-align: right;width: 30%;">
+                          <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">可换件</van-tag>
+                          <van-tag catchtap="flag_bindtap" wx:if="{{item.flag}}" type="danger" color="red" style="text-align: right;">需设计</van-tag>
                         </view>
+                      </view>
+
+                      <view slot="desc">
+                        <view style="display:flex;width: 100%;">
+                          <view style="width: 80%;">
+                            <dk-text fontWeight="nomal" value="{{item.desc}}"></dk-text>
 
+                          </view>
+
+                        </view>
                       </view>
-                    </view>
-                    <view slot="price">
-                      <view style="display: flex;width: 100%;flex-direction: row;">
-                        <view style="width: 100%;text-align: right;font-size: 3.5vw;">销售数量：<span style="line-height:56rpx;color:red;">{{item.orderQuantity}}</span></view>
+                      <view slot="price">
+                        <view style="display: flex;width: 100%;flex-direction: row;">
+                          <view style="width: 100%;text-align: right;font-size: 3.5vw;">销售数量：<span style="line-height:56rpx;color:red;">{{item.orderQuantity}}</span></view>
+                        </view>
                       </view>
-                    </view>
 
 
 
-                    <view slot="footer">
-                      <view style="display: flex;width: 100%;margin-top:5px;" data-index="{{index}}">
-                        <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
-                          备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
+                      <view slot="footer">
+                        <view style="display: flex;width: 100%;margin-top:5px;" data-index="{{index}}">
+                          <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
+                            备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
+                          </view>
+                          <view style="width: 100%;text-align: right;font-size: 3.5vw;">售价：<span style="line-height:56rpx;color:#CAA977;">￥{{item.orderPriceSale}}</span></view>
                         </view>
-                        <view style="width: 100%;text-align: right;font-size: 3.5vw;">售价：<span style="line-height:56rpx;color:#CAA977;">￥{{item.orderPriceSale}}</span></view>
                       </view>
-                    </view>
-                  </van-card>
-                </view>
-              </van-collapse-item>
-            </van-collapse>
+                    </van-card>
+                  </view>
+                </van-collapse-item>
+              </van-collapse>
 
+            </view>
           </view>
         </view>
+        <van-empty wx:if="{{orderList_out.length==0}}" description="暂无数据" />
       </view>
-      <van-empty wx:if="{{orderList_out.length==0}}" description="暂无数据" />
-    </view>
 
 
 
 
-  </view>
+    </view>
+  </van-tab>
+
 
 
   <van-tab title-style="color:#96A7C5;" title="收款记录">
-    <view style="margin-bottom: 1vw;" wx:for="{{listFee}}" wx:for-index="index">
+    <view style="margin-bottom: 1vw;" wx:for="{{paymentRecordsList}}" wx:for-index="index">
 
       <view class="table-show">
         <view class="table-show-detail">
-          <view style="display:flex;background-color:#FBF6EF;">
-            <image style="width:5vw;height:5vw;align-self:center;margin: 2vw;" src="{{imageUrl + 'customer-assignment.png'}}">
-            </image>
-            <view>
-              <view style="font-weight:bold;font-size: 26rpx;">{{item.receiptNo}}</view>
-              <view style="font-size: 12px;color:#95A8CB;">{{item.opCreateTime}}</view>
+          <view style="display:flex;background: linear-gradient(95.33deg, #ADC6FF -2.27%, #F0F5FF 60.66%),radial-gradient(35.34% 100.27% at 10.78% 50%, rgba(159, 197, 255, 0.6) 0%, rgba(255, 255, 255, 0.426) 56.69%);border-radius: 15rpx  15rpx  0rpx  0rpx;padding: 20rpx;">
+            <view style="width: 10%;display: flex;align-items: center;">
+              <image style="width:20px;height:20px;" src="{{imageUrl + 'customer_detail_icon_04.png'}}"> </image>
+            </view>
+
+            <view style="display: flex;align-items: center;width: 60%;">
+              <view style="font-weight:bold;font-size: 26rpx;">{{item.rpNo}}</view>
             </view>
-            <view style="color: #00A7B5;font-size: 13px;align-self:center;flex:1;margin-left: 35px; display: flex;" bindtap="toOriginal_order_collection" data-item="{{item}}">
+            <view style="color: #00A7B5;font-size: 13px;align-items:center;display: flex;justify-content: right;width: 30%;" bindtap="toOriginal_order_collection" data-item="{{item}}">
               <view>查看原单 </view>
               <van-icon name="arrow" />
             </view>
@@ -781,7 +781,7 @@
                     </dk-text>
                   </view>
                   <view class="table-content-class">
-                    {{item.docCode}}
+                    {{item.rpTypeName}}
                   </view>
 
                 </view>
@@ -789,7 +789,7 @@
                 <view style="text-align:right;width: 50%;">
                   <!-- <dk-text fontSize="17" color="#CAA977" value=" ￥{{item.sumAmount}}">
                   </dk-text> -->
-                  <dk-cell height="46rpx" contentRight="{{true}}" spaceWidth="15rpx" fontSize="17" contentColor="#CAA977" fontWeight="" title=" " content="{{item.sumAmount ? item.sumAmount : 0}}"></dk-cell>
+                  <dk-cell height="46rpx" contentRight="{{true}}" spaceWidth="15rpx" fontSize="17" contentColor="#CAA977" fontWeight="" title=" " content="{{item.receiptResidue ? item.receiptResidue : 0}}"></dk-cell>
                 </view>
               </view>
 
@@ -802,21 +802,21 @@
       </view>
     </view>
 
-    <van-empty wx:if="{{listFee.length==0}}" description="暂无数据" />
+    <van-empty wx:if="{{paymentRecordsList.length==0}}" description="暂无数据" />
   </van-tab>
   <van-tab title-style="color:#96A7C5;" title="退款记录">
-    <view style="margin-bottom: 1vw;" wx:for="{{listRefund}}" wx:for-index="index">
-
+    <view style="margin-bottom: 1vw;" wx:for="{{refundRecordsList}}" wx:for-index="index">
       <view class="table-show">
         <view class="table-show-detail">
-          <view style="display:flex;background-color:#FBF6EF;">
-            <image style="width:5vw;height:5vw;align-self:center;margin: 2vw;" src="{{imageUrl + 'customer-assignment.png'}}">
-            </image>
-            <view>
-              <view style="font-weight:bold;font-size: 26rpx;">{{item.refundNo}}</view>
-              <view style="font-size: 12px;color:#95A8CB;">{{item.opCreateTime}}</view>
+          <view style="display:flex;background: linear-gradient(95.33deg, #ADC6FF -2.27%, #F0F5FF 60.66%),radial-gradient(35.34% 100.27% at 10.78% 50%, rgba(159, 197, 255, 0.6) 0%, rgba(255, 255, 255, 0.426) 56.69%);border-radius: 15rpx  15rpx  0rpx  0rpx;padding: 20rpx;">
+            <view style="width: 10%;display: flex;align-items: center;">
+              <image style="width:20px;height:20px;" src="{{imageUrl + 'customer_detail_icon_04.png'}}"> </image>
+            </view>
+
+            <view style="display: flex;align-items: center;width: 60%;">
+              <view style="font-weight:bold;font-size: 26rpx;">{{item.rpNo}}</view>
             </view>
-            <view style="color: #00A7B5;font-size: 13px;align-self:center;flex:1;margin-left: 35px; display: flex;" bindtap="toRefund" data-item="{{item}}">
+            <view style="color: #00A7B5;font-size: 13px;align-items:center;display: flex;justify-content: right;width: 30%;" bindtap="toOriginal_order_collection" data-item="{{item}}">
               <view>查看原单 </view>
               <van-icon name="arrow" />
             </view>
@@ -840,11 +840,11 @@
               <view style="display: flex;justify-content:space-between;">
                 <view style="display: flex; width: 50%;">
                   <view class="table-content-row-font">
-                    <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="退款类型">
+                    <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="收款类型">
                     </dk-text>
                   </view>
                   <view class="table-content-class">
-                    {{item.docCode}}
+                    {{item.rpTypeName}}
                   </view>
 
                 </view>
@@ -852,7 +852,7 @@
                 <view style="text-align:right;width: 50%;">
                   <!-- <dk-text fontSize="17" color="#CAA977" value=" ￥{{item.sumAmount}}">
                   </dk-text> -->
-                  <dk-cell height="46rpx" contentRight="{{true}}" spaceWidth="15rpx" fontSize="17" contentColor="#CAA977" fontWeight="" title=" " content="{{item.refundAmount ? item.refundAmount : 0}}"></dk-cell>
+                  <dk-cell height="46rpx" contentRight="{{true}}" spaceWidth="15rpx" fontSize="17" contentColor="#CAA977" fontWeight="" title=" " content="{{item.sumAmtRec ? item.sumAmtRec : 0}}"></dk-cell>
                 </view>
               </view>
 
@@ -865,7 +865,7 @@
       </view>
     </view>
 
-    <van-empty wx:if="{{listRefund.length==0}}" description="暂无数据" />
+    <van-empty wx:if="{{refundRecordsList.length==0}}" description="暂无数据" />
   </van-tab>
 
   <van-tab title-style="color:#96A7C5;" title="客户信息">

package-basic-data/pages/customer-list/detail/detail.wxss

@@ -190,7 +190,6 @@ page {
 }
 
 .table-show-detail {
-  background: #FFFFFF;
   box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);
   border-radius: 15rpx;
 }

package-basic-data/pages/customer-reception/add/add.js

@@ -47,6 +47,7 @@ Page({
    */
   setParams(params) {
     params.followStatus = this.data.followStatus
+    params.followType = '跟进方式-进店'
     params.followOrg = app.globalData.user.orgId
     return params
   },
@@ -232,7 +233,7 @@ Page({
       { code: 'file', type: 'uploader', title: mixins.$t("uploader") }
     ]
     let radioFollowUpTwolist = [
-      { code: 'intention', name: 'intentionName', type: 'drop', required: true, dropType: 'customerIntention', title: mixins.$t('intention') },
+      // { code: 'intention', name: 'intentionName', type: 'drop', required: true, dropType: 'customerIntention', title: mixins.$t('intention') },
       { code: 'remarks', type: 'textarea', rows: '5', required: true, showWordLimit: true, title: mixins.$t('followData') },
       { code: 'stayTimeLen', name: 'stayTimeLenName', required: true, title: mixins.$t('stayTimeLen'), dropType: 'storeRetentionTime', type: 'drop', },
       { code: 'file', type: 'uploader', title: mixins.$t("uploader") }

package-inventory/pages/other-outbound/other-outbound.js

@@ -145,7 +145,7 @@ Page({
         routeObjName: 'outboundOther',
         table: Constants.tables.outbound,
         // 系统参数
-        flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "1" ? true : false
+        flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "true" ? true : false
     },
 
     /**
@@ -383,7 +383,7 @@ Page({
         // 系统参数
         params.flgHandleSetting = this.data.flgHandleSetting
         //负库存
-        params.canNegativeFlag = app.globalData.setting[Constants.settingCode.IVT002] == "1" ? true : false
+        params.canNegativeFlag = app.globalData.setting[Constants.settingCode.IVT002]  == "true" ? true : false
         // params.fromId = this.data.purIdArray  //来源id
         // params.fromNo = formData.fromNo  //来源单号
         params.orgId = formData.orgId  //组织部门

package-inventory/pages/other-warehousing/other-warehousing.js

@@ -147,7 +147,7 @@ Page({
         routeObjName: 'inboundOther',
         table: Constants.tables.inbound,
          // 系统参数
-        flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "1" ? true : false
+        flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001]   == "true" ? true : false
 
     },
 
@@ -307,6 +307,7 @@ Page({
             element.intoAmt = 0     //  已入库金额
             element.intoQty = 0     //  已入库数量
             totalAmout += Number(element.pricePurchase * element.itemQty)
+            element.nonStdCode = element.nonStdCode!=null?element.nonStdCode:'-'
         })
         // 左下角的合计金额
         contentList_.forEach(card => {
@@ -350,6 +351,10 @@ Page({
                 util.showToast(mixins.$t("inputWords") + "[" + element.skuCode + "]" + mixins.$t("count"));
                 return false
             }
+            if (element.nonStdCode == null || element.nonStdCode == '' || element.nonStdCode.length == 0) {
+                util.showToast(mixins.$t("inputWords") + "[" + element.skuCode + "]" + mixins.$t("goodsBatch"));
+                return false
+            }
         }
         return true
     },

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

@@ -308,9 +308,9 @@ Page({
         data.goodsList.forEach(element => {
             element.chooseFlg = "biu" //辨别选品标识
             element.priceStd = element.priceStandard
-            element.pricePur = element.pricePurchase
+            element.pricePur =  element.pricePur? element.pricePur:element.pricePurchase
             element.amtStd = Number(element.priceStd * element.itemQty) //标价金额
-            element.priceDiscount = (Number(element.pricePurchase) / Number(element.priceStandard)) * 100;  
+            element.priceDiscount = (Number(element.pricePur) / Number(element.priceStandard)) * 100;  
             element['itemQty_min'] = Number(element.intoingQty+element.intoQty) 
             if(element.intoingQty>0||element.intoQty>0){
                 element.deleteFlag = false
@@ -331,11 +331,7 @@ Page({
                 card.content = data.goodsList.sum("itemAmt")
             }
         })
-        // popContent_.forEach(card => { //
-        //     if (card.code === 'itemQty') {
-        //         card.max = 1
-        //     }
-        // })
+  
         let  dataTime =  this.convertDateToMillisecondsTimestamp(data.pickupDate)
         this.setData({
           dataTime:dataTime,
@@ -362,10 +358,10 @@ Page({
         let formData = JSON.parse(this.data.formData)
         let totalAmout = Number(0)
         // 各个明细的金额数量
-        formData.goodsList.forEach(element => { //循环出商品总共价格  
-            element.itemAmt = element.pricePurchase * element.itemQty
+        formData.goodsList.forEach(element => { //循环出商品总共价格   
             element.priceStd = element.priceStandard 
             element.pricePur =  element.pricePur? element.pricePur:element.pricePurchase
+            element.itemAmt = element.pricePur * element.itemQty
             element.amtStd = element.priceStd * element.itemQty
             element.priceDiscount = (Number(element.pricePur) / Number(element.priceStandard)) * 100;
             totalAmout += Number(element.pricePur * element.itemQty)

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

@@ -6,7 +6,7 @@
 <!-- <dk-form id="{{formName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
 </dk-form> -->
 
-<dk-form-bill id="{{formName}}"  type="pur"  routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" subCol="skuCode"descCol="skuModel" priceCol="pricePur" quantityCol="itemQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['referencePrice']}}：" bind:editItems="setGoods" bind:clear = "clear" table="{{table}}"  dataTime = "{{dataTime}}"
+<dk-form-bill id="{{formName}}"  type="pur"  routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" subCol="skuCode"descCol="skuModel" priceCol="pricePur"pupPriceCol="pricePurchase"  quantityCol="itemQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['referencePrice']}}：" bind:editItems="setGoods" bind:clear = "clear" table="{{table}}"  dataTime = "{{dataTime}}"
 bind:delItem="setGoods" bind:setGoods="setGoods">
 </dk-form-bill>
 

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

@@ -65,7 +65,7 @@ Page({
         title:  mixins.$t('uploader'),//'附件'
       }]
     },
-    popContent: [{
+    popContent: [    { code: 'pricePur', type: 'number', title: mixins.$t("pricePur"), required: true },{
         code: 'itemQty',
         type: 'step',
         title: mixins.$t('count'),//'数量',
@@ -136,7 +136,15 @@ Page({
     data.goodsList = data.purchaseItemResponseList
     let cardList_ = this.data.cardList
     let contentList_ = this.data.contentList
-
+    data.goodsList.forEach(element => {
+     
+      element.priceStd = element.priceStandard
+      element.pricePur =  element.pricePur? element.pricePur:element.pricePurchase
+      element.amtStd = Number(element.priceStd * element.itemQty) //标价金额
+      element.priceDiscount = (Number(element.pricePur) / Number(element.priceStandard)) * 100;  
+     
+    
+  });
     cardList_.forEach(card => {
       if (card.name === 'items') {
         card.itemAmt = data.goodsList.sum("itemAmt")

package-purchase/pages/purchase-order/purchase-order-detail/purchase-order-detail.wxml

@@ -100,7 +100,7 @@
 
 
 <!-- 商品信息 和 其他信息 -->
-<dk-form-bill id="{{formName}}" routeObjName="{{routeObjName}}" readonly="{{true}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="pricePur" quantityCol="itemQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['wholesalePrice']}}：">
+<dk-form-bill id="{{formName}}" routeObjName="{{routeObjName}}" readonly="{{true}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="pricePur"pupPriceCol="pricePurchase" quantityCol="itemQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['wholesalePrice']}}：">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

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

@@ -155,7 +155,7 @@ Page({
     purchaseService: app.globalData['purchaseService'], //采购订单 路由
     inboundProcessingService: app.globalData['inboundProcessingService'],
     // 系统参数
-    flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "1" ? true : false
+    flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001]  == "true" ? true : false
   },
   /**
    * @desc : 选择框右边删除 回调

package-purchase/pages/purchase-receipt/purchase-receipt.js

@@ -16,7 +16,9 @@ Page({
    * 页面的初始数据 
    */
   data: {
-    isfirst:true,
+    // 系统参数
+    flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "true" ? true : false ,
+    isfirst: true,
     // 弹出按钮
     pointButtonList: [{
         name: 'inProcessing',
@@ -33,7 +35,7 @@ Page({
       {
         name: 'ticketPirnt',
         title: mixins.$t('ticketPirnt'),
-      }, 
+      },
     ],
     // 弹出按钮
     buttonList: [{
@@ -66,42 +68,42 @@ Page({
         searchType: Constants.searchType.pick
       }
     ],
-   // 查询条件-筛选
-   pullMenuList: [{
-    code: 'intoStatus',
-    pullType: 'mSelect',
-    typeName: 'inInventoryStatus'
-  },
-  {
-    code: 'supName',
-  },
-  {
-    code: 'staffName',
-  },
-  {
-    code: 'orgName',
-  },
-  {
-    code: 'whName',
-  },
-  {
-    code: 'makeTime',
-    title:mixins.$t('intoDate'),
-    dataType: 'date'
-  },
-  { 
-    code: 'flgValid',
-    title: mixins.$t('flgValid'),
-    dataType: 'checkbox'
-  },
-  ],
+    // 查询条件-筛选
+    pullMenuList: [{
+        code: 'intoStatus',
+        pullType: 'mSelect',
+        typeName: 'inInventoryStatus'
+      },
+      {
+        code: 'supName',
+      },
+      {
+        code: 'staffName',
+      },
+      {
+        code: 'orgName',
+      },
+      {
+        code: 'whName',
+      },
+      {
+        code: 'makeTime',
+        title: mixins.$t('intoDate'),
+        dataType: 'date'
+      },
+      {
+        code: 'flgValid',
+        title: mixins.$t('flgValid'),
+        dataType: 'checkbox'
+      },
+    ],
     tagList: [{
       title: mixins.$t('inStorage')
     }, {
       title: mixins.$t('received')
     }],
     contentObj: {
-      [mixins.$t("inStorage")]: [{  
+      [mixins.$t("inStorage")]: [{
         name: 'intoNo',
         title: mixins.$t("inOrderNo") //入库单号
       }, {
@@ -152,6 +154,7 @@ Page({
       title: mixins.$t("piece"), //件
     }],
     purchaseService: app.globalData['purchaseService'],
+    inboundProcessingService: app.globalData['inboundProcessingService'],
     // 路由
     routeObjName: 'inbound',
   },
@@ -188,7 +191,7 @@ Page({
     let item = e
     let id = item.intoId
     // 采购入库 
-    this.excute(this.data.service, this.data.service.inboundRepeal + id, null).then(res => {
+    this.excute(this.data.inboundProcessingService, this.data.inboundProcessingService.inboundRepeal + id, null).then(res => {
       if (res.data.code == Constants.SUCESS_CODE) {
         // 重新查询
         this.searchData()
@@ -197,6 +200,22 @@ Page({
 
   },
   /**
+   * @desc : 入库撤回
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  handleWarehousing(e) {
+    let item = e
+    let id = item.intoId
+    // 采购入库 
+    this.excute(this.data.inboundProcessingService, this.data.inboundProcessingService.inBoundCancel, item).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE) {
+        // 重新查询
+        this.searchData()
+      }
+    })
+  },
+  /**
    * @desc : 详细页面 （编辑）
    * @date : 2024/2/1 15:49
    * @author : 王英杰
@@ -222,7 +241,32 @@ Page({
       }
     })
   },
-
+  /**
+   * @desc : 入库办理 （编辑）
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  inProcessing(e) {
+    let activity = this.data.active
+    let Id = e.intoId
+    wx.navigateTo({
+      url: this.data.route.detail.url,
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {
+          console.log("toDetail", e);
+        }
+      },
+      success: function (res) {
+        // formType ==1  是 查询采购订单   ==2 是采购入库单
+        res.eventChannel.emit('params', {
+          id: Id,
+          formMode: Constants.formMode.edit,
+          formType: activity + 1
+        })
+      }
+    })
+  },
   /**
    * @desc : 新建
    * @date : 2024/2/1 15:49
@@ -237,16 +281,113 @@ Page({
       }
     })
   },
+  pupButtons() {
+    return [{
+        name: 'editInbound',
+        title: mixins.$t('edit'),
+      },
+      {
+        name: 'invaidOrder',
+        title: mixins.$t('invaidOrder'),
+      },
+      {
+        name: 'ticketPirnt',
+        title: mixins.$t('ticketPirnt'),
+      },
+    ];
+  },
+
   /**
    * @desc : 切换  待出库  已出库
+   * 采购入库 入库中三个点 入库办理 、编辑、作废、票据打印
+   * 已入库三个点按钮入库撤回、编辑、作废、票据打印（入库撤回参数手动办理时显示；作废参数自动办理时显示）
    * @date : 2024年3月8日
    * @author : 王英杰
    */
   onChangeTabs(e) {
     let index = e.detail.detail.index
+    let flgHandleSetting = this.data.flgHandleSetting
+    let pupButtons = this.pupButtons()
     this.setData({
       active: index,
     })
+    if (index == 0) {
+      if (flgHandleSetting) {
+        // 如果flgHandleSetting为true，则先添加inProcessing按钮，再添加通用按钮  
+        this.setData({
+          pointButtonList: [{
+              name: 'inProcessing',
+              title: mixins.$t('inProcessing'),
+            },
+            {
+              name: 'editInbound',
+              title: mixins.$t('edit'),
+            },
+            {
+              name: 'invaidOrder',
+              title: mixins.$t('invaidOrder'),
+            },
+            {
+              name: 'ticketPirnt',
+              title: mixins.$t('ticketPirnt'),
+            },
+          ]
+        });
+      } else {
+        // 如果flgHandleSetting为false，则直接设置通用按钮  
+        this.setData({
+          pointButtonList: [{
+              name: 'inProcessing',
+              title: mixins.$t('inProcessing'),
+            },
+            {
+              name: 'invaidOrder',
+              title: mixins.$t('invaidOrder'),
+            },
+            {
+              name: 'ticketPirnt',
+              title: mixins.$t('ticketPirnt'),
+            },
+          ]
+        });
+      }
+    } else {
+      if (flgHandleSetting) {
+        this.setData({
+          pointButtonList: [{
+              name: 'editInbound',
+              title: mixins.$t('edit'),
+            },
+            {
+              name: 'invaidOrder',
+              title: mixins.$t('invaidOrder'),
+            },
+            {
+              name: 'ticketPirnt',
+              title: mixins.$t('ticketPirnt'),
+            },
+          ]
+        });
+      } else {
+        this.setData({
+          pointButtonList: [{
+              name: 'handleWarehousing',
+              title: mixins.$t('handleWarehousing'),
+            },
+            {
+              name: 'editInbound',
+              title: mixins.$t('edit'),
+            },
+          
+            {
+              name: 'ticketPirnt',
+              title: mixins.$t('ticketPirnt'),
+            },
+          ]
+        });
+      }
+
+    }
     this.searchData()
   },
   /**
@@ -264,28 +405,28 @@ Page({
       params.intoStatus = Constants.intoStatus.inBounded //'入库状态-已入库'
       params.intoType = Constants.intoType.pur //'入库类型-采购入库'
     }
-    if( params.flgValid){//true 说明包含作废单据  查出数据不受 flgValid 筛选
+    if (params.flgValid) { //true 说明包含作废单据  查出数据不受 flgValid 筛选
       params.flgValid = null
-    }else{//默认不查作废单据
-      params.flgValid =   !params.flgValid
+    } else { //默认不查作废单据
+      params.flgValid = !params.flgValid
     }
     params.makeTime = null
     //采购订单明细 跳转到采购入库
     let isfirst = this.data.isfirst
-    let purNo = this.data.item?this.data.item.purNo :null
-    if (isfirst&&purNo) { //第一次进入 取传过来的  
+    let purNo = this.data.item ? this.data.item.purNo : null
+    if (isfirst && purNo) { //第一次进入 取传过来的  
       let searchForm = this.data.searchForm ? JSON.parse(this.data.searchForm) : {}
-      searchForm.searchText = purNo||''
-      this.setData({ 
+      searchForm.searchText = purNo || ''
+      this.setData({
         searchForm: JSON.stringify(searchForm),
-        searchText: purNo ||'',
+        searchText: purNo || '',
       })
       params.searchForm = JSON.stringify(searchForm)
       params.searchText = purNo
     }
     this.setData({
       isfirst: false
-    }) 
+    })
     return params;
   },
   /** 
@@ -299,7 +440,7 @@ Page({
     // }else { //已入库
     //   return this.excute(this.data.service, this.data.service.selectByCond, params);
     // }
-    
+
     return this.excute(this.data.service, this.data.service.selectByCond, params);
   },
 
@@ -310,7 +451,7 @@ Page({
    */
   handleSearchData(tableData) {
     let temp = tableData
-  
+
     let footerAmount = this.data.footerAmount
     let footerInfo = this.data.footerInfo
     let contentnFootList = this.data.contentList
@@ -352,5 +493,52 @@ Page({
       contentList: contentnFootList,
     })
   },
-
+  /**
+   * @desc : 初始化数据
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  loadInit() {
+    let flgHandleSetting = this.data.flgHandleSetting
+    let pupButtons = this.pupButtons()
+    if (flgHandleSetting) { //自动的话 要隐藏作废
+      // 如果flgHandleSetting为true，则先添加inProcessing按钮，再添加通用按钮  
+      this.setData({
+        pointButtonList: [{
+            name: 'inProcessing',
+            title: mixins.$t('inProcessing'),
+          },
+          {
+            name: 'editInbound',
+            title: mixins.$t('edit'),
+          },
+          {
+            name: 'invaidOrder',
+            title: mixins.$t('invaidOrder'),
+          },
+          {
+            name: 'ticketPirnt',
+            title: mixins.$t('ticketPirnt'),
+          },
+        ]
+      });
+    } else {
+      // 如果flgHandleSetting为false，则直接设置通用按钮  
+      this.setData({
+        pointButtonList: [{
+            name: 'inProcessing',
+            title: mixins.$t('inProcessing'),
+          },
+          {
+            name: 'editInbound',
+            title: mixins.$t('edit'),
+          },
+          {
+            name: 'ticketPirnt',
+            title: mixins.$t('ticketPirnt'),
+          },
+        ]
+      });
+    }
+  },
 })

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

@@ -15,9 +15,9 @@
 <!-- 列表区 -->
 <dk-list   bind:toPoint="toPoint"   bind:toDetail="toDetail"
    list="{{tableData}}" flgPoint = "{{true}}" title="supplierName" 
-    status="intoStatusName"  contentCol="intoStatusName"routeObjName="{{routeObjName}}"
+    status="intoStatusName"  contentCol="intoStatusName" routeObjName="{{routeObjName}}"
      contentObj="{{contentObj}}" footerAmount="{{footerAmount}}" 
-     footerInfo="{{footerInfo}}" buttonList="{{pointButtonList}}"  ></dk-list>
+     footerInfo="{{footerInfo}}" buttonList="{{pointButtonList}}" bind:open="open" ></dk-list>
 
 <!-- 显示没用更多 -->
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>

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

@@ -11,9 +11,9 @@ Page({
   data: {
     routeObjName: 'inboundReturn',
     tableData: [],
-    btnFormData: JSON.stringify({ flag: app.globalData.setting[Constants.settingCode.IVT001] == "1" ? true : false }),
+    btnFormData: JSON.stringify({ flag: app.globalData.setting[Constants.settingCode.IVT001] == "true" ? true : false }),
     // 系统参数
-    flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "1" ? true : false,
+    flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "true" ? true : false,
     pageFlag: false,
     pageFlag: false,
     flgAutoIvt: false,
@@ -96,14 +96,6 @@ Page({
 
       }
     }
-    // if (code == "staffId") { //员工
-    //   formData.staffId = data.id
-    //   formData.staffName = data.name
-    // }
-    // if (code == "orgId") { //员工
-    //   formData.orgId = data.id
-    //   formData.orgName = data.name
-    // }
     ///设置主从业务员
     if (code == 'staff') {
       formData.staff = e.detail.data.staffItem
@@ -168,7 +160,6 @@ Page({
     }
     // 系统参数
     params.flgHandleSetting = this.data.flgHandleSetting
-    // params.flgHandleSetting = btnFormData ? btnFormData.flag : false //自动出入库标识 
     params.itemList = params.goodsList
     params.orgId = app.globalData.user.orgId
     params.staffId = app.globalData.user.staffId
@@ -287,7 +278,6 @@ Page({
     let sumReturnAmt = Number(0) //合计金额
     let sumReturnQty = Number(0) //合计金额
     formData.goodsList.forEach(res => {
-
       if (this.data.formMode != 'edit') {
         res.returnQty = res.itemQty
       }
@@ -295,7 +285,6 @@ Page({
       sumReturnAmt += res.returnAmt
       sumReturnQty += res.returnQty
     })
-
     let cardList = this.data.cardList
     let contentList = this.data.contentList
     formData.returnAmt = sumReturnAmt
@@ -306,14 +295,11 @@ Page({
     } else {
       cardList[0].sumReturnAmt = sumReturnAmt.toFixed(2)
     }
-
     if (contentList.length > 0) {
       contentList[2].content = sumReturnAmt.toFixed(2)
     }
     let beforeSumAmount = this.data.beforeSumAmount
     let afterSumAmount = beforeSumAmount - sumReturnAmt
-
-    console.log('formData', formData)
     this.setData({
       afterSumAmount: afterSumAmount,
       cardList: cardList,
@@ -322,12 +308,10 @@ Page({
       sumReturnAmt: sumReturnAmt.toFixed(2),
       sumReturnQty: sumReturnQty,
     })
-    console.log('1',this.data.formMode)
-    console.log('2',this.data.formType)
     if(this.data.formType !=='edit'){
       this.calculationSalesUsableQty()
     }
-    
+    // this.calculationSalesUsableQty()
   },
   /**
    * @desc :   自动办理事件
@@ -342,12 +326,9 @@ Page({
       Dialog.confirm({
         message: mixins.$t("saleOutBoundInfo"),
       }).then(() => {
-
         that.setData({
           goodsTagText: null
         })
-
-
       }).catch(() => {
         btnFormData.flag = true
         that.setData({
@@ -381,8 +362,6 @@ Page({
       address: data.returnAddress,
       addressFull: data.returnAddress,
     }
-
-
     this.setData({
       beforeSumAmount: data.returnAmt,
       formData: JSON.stringify(formData)
@@ -426,7 +405,6 @@ Page({
       console.log('formMode', that.data.formMode)
       console.log('formType', that.data.formType)
       if (that.data.formMode !== Constants.formMode.edit && that.data.formType !== Constants.formMode.add) {
-        console.log('源单跳转来的1')
         let formData = that.data.formData
         formData = {
           goodsList: data.choooseInboundItemList
@@ -445,7 +423,6 @@ Page({
           formData.intoDate = utils.formatDayTime(new Date())
 
         }
-       
         that.setData({
           formData: JSON.stringify(formData),
           beforeSumAmount: Number(data.beforeSumAmount),
@@ -466,15 +443,16 @@ Page({
             { name: 'other', title: mixins.$t("otherInfo") }
           ]
         })
-
       }
-
     })
-
   },
 
 
-
+  /**
+    * @desc : 设置业务员业务部门
+    * @date : 2024/2/1 15:49
+    * @author : 于继渤
+    */
   setStaffOrg() {
     let formData = JSON.parse(this.data.formData)
     formData['staff'] = {

package-purchase/pages/purchase-return/detail/detail.wxml

@@ -41,7 +41,7 @@
 </view>
 
 
-<dk-form-bill id="dk-form-bill" routeObjName="{{routeObjName}}" bind:onStepper="onChangeStepper" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" showPopFlag="{{true}}" descCol="skuModel" priceCol="priceReturn" quantityCol="returnQty" quantityMin="returnQtyMin" quantityMax="returnQtyMax" stepperFlag="{{item.outStatus !=='出库状态-已出库' ?  true : false}}" sumAmountCol="sumReturnAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popType="sale" priceTitle=""  stepperFlag="{{false}}">
+<dk-form-bill id="dk-form-bill" routeObjName="{{routeObjName}}" bind:onStepper="onChangeStepper" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" showPopFlag="{{true}}" descCol="skuModel" priceCol="priceReturn" quantityCol="returnQty" quantityMin="returnQtyMin" quantityMax="returnQtyMax" stepperFlag="{{item.outStatus !=='出库状态-已出库' ?  true : false}}" sumAmountCol="sumReturnAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popType="sale" priceTitle=""  stepperFlag="{{true}}">
 </dk-form-bill>
 
 <!-- 空高度  -->

package-sales/pages/order-billing/order-billing.js

@@ -204,6 +204,7 @@ Page({
     if (!params.outStatusList) {
       params.outStatusList = this.data.outStatus == 'all' ? [] : this.data.outStatus
     }
+    params.cusId = this.data.id ? this.data.id : null
     params.viewVoidedDocuments = params.viewVoidedDocuments ? true : false
     delete params['deliveryDate']
     return params

package-sales/pages/order-return/order-return.js

@@ -136,6 +136,7 @@ Page({
 setSearchParams(params) {
   //销售状态
   params.outTypeList = [Constants.outType.intoReturn]
+  params.cusId = this.data.id ? this.data.id : null
   return params
 },
   

package-sales/pages/sales-outbound/add/add.js

@@ -75,7 +75,7 @@ Page({
     popupTopObj: [{ leftTitle: '库存量', leftCode: 'usableQty', rightTitle: '可售量', rightCode: 'invQty' }],
     titpsFlag: true,
     // 系统参数
-    flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "1" ? true : false
+    flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001]  == "true" ? true : false 
   },
   /**
      * @desc :   编辑

pages/shopping/shopping.wxml

@@ -15,7 +15,7 @@
 <van-dialog id="van-dialog" />
 
 <van-sticky offset-top="{{ 0 }}">
-  <van-nav-bar title="购物车" left-text="" left-arrow="{{false}}" bind:click-left="onClickLeft" />
+  <van-nav-bar title="购物车"  border="{{false}}"  left-text="" left-arrow="{{false}}" bind:click-left="onClickLeft" />
 <view style="display: flex;">
 <view style="width: 85%;">
   <van-search border="{{false}}" bind:search="doSearch" custom-class="search-class" bind:change="onSearchText" model:value="{{ searchText }}" placeholder="输入商品名/商品编码/唯一编码" use-right-icon-slot="{{true}}" placeholder-style="color:#95A8CB">