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

api/pages/mst/supplier.js

@@ -17,8 +17,16 @@ module.exports = {
   routeUrl: {
     supplier: { 
       add: { key: 'add', url: '/package-purchase/pages/supplier-list/add/add'  },
-      edit: { key: 'edit', url: '/package-purchase/pages/supplier-list/add/add'  },
+      edit: { key: 'edit', url: '/package-purchase/pages/supplier-list/add/add',idKey:'supId'  },
       detail: { key: 'detail', url: '/package-purchase/pages/supplier-list/detail/detail'  },
+      purDetail: { key: 'purDetail', url: '/package-purchase/pages/purchase-order/purchase-order-detail/purchase-order-detail', formMode: 'edit', idKey: 'purId' },
+      purRetuenDetail: { key: 'purRetuenDetail', url: '/package-purchase/pages/purchase-return/detail/detail', formMode: 'edit', idKey: 'intoId' },
+      refundDetail:{ key: 'refundDetail', url: '/package-purchase/pages/pur-refund/detail/detail', formMode: 'edit',formType:'edit', idKey: 'supId' },
+      receiptDetail:{ key: 'receiptDetail', url: '/package-purchase/pages/pur-receipt/detail/detail', formMode: 'edit',formType:'edit', idKey: 'supId', image:'btn-customer-collection.png' },
+
+      toPurOrder:{ key: 'toPurOrder', url: '/package-purchase/pages/purchase-order/add/add', formMode: 'add' ,formType: 'add', idKey: 'supId' } ,
+      toPurOrderReturn:{ key: 'toPurOrderReturn', url: '/package-purchase/pages/purchase-return/add/add',  formMode: 'add' ,formType: 'add', idKey: 'supId' } ,
+      toPurReceipt:{ key: 'toPurReceipt', url: '/package-purchase/pages/pur-receipt/add/add', formMode: 'add',formType:'add', idKey: 'cusId', image:'btn-customer-collection.png' },
       chooseSupplierCategory: { key: 'chooseSupplierCategory', url: '/package-base-select/pages/select-data/select-data',type:'kindData', kindType:'供应商类别' },
       chooseServiceCategory: { key: 'chooseServiceCategory', url: '/package-base-select/pages/select-data/select-data',type:'kindData', kindType:'服务类别' , chooseFlag:true },
       chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },

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

@@ -988,7 +988,7 @@ Page({
    * @date   : 2024/2/2 11:46
    */
   changeField(e) {
-    let dataItem = JSON.parse(this.data.dataItem)
+    let dataItem = JSON.parse(this.data.dataItem) 
     dataItem[e.detail.key] = e.detail.name
     this.setData({
       dataItem: JSON.stringify(dataItem)
@@ -1350,6 +1350,22 @@ Page({
     })
   },
   /**
+   * @desc : 选择回调
+   * @date : 2024/7/11 15:59
+   * @author : 刘尧
+   */
+  openChoose(e){
+    console.log('openChoose', e.detail);
+    const key = e.detail.key
+    const nameKey = e.detail.nameKey
+    let dataItem = JSON.parse(this.data.dataItem)
+    dataItem[key] = e.detail.id
+    dataItem[nameKey] = e.detail.name
+    this.setData({
+      dataItem: JSON.stringify(dataItem)
+    })
+  },
+  /**
    * @desc : 初始化
    * @date : 2024/2/1 15:49
    * @author : 于继渤

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

@@ -400,7 +400,7 @@
 
 <!--  采购入库 采购订单 其它入库  -->
  
-<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' && billType !== 'inventory' && billType !== 'out'   }}" stepperDecimal="decimalPlaces" type="sale" descCol="skuName" titleTagCol="brandName" titleCol="skuModel" iconCol="imagesUrl" subCol="calculationFormula" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="sumPrice" contentObj="{{popContent}}" bind:changeStep="changeStep" bind:changeField="changeField" bind:blurNumberField="blurNumberField" bind:openPackageBox="openPackageBox" bind:commit="editItems"validFlag='{{true}}'>
+<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' && billType !== 'inventory' && billType !== 'out'   }}" stepperDecimal="decimalPlaces" type="sale" descCol="skuName" titleTagCol="brandName" titleCol="skuModel" iconCol="imagesUrl" subCol="calculationFormula" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="sumPrice" contentObj="{{popContent}}" bind:changeStep="changeStep" bind:changeField="changeField" bind:blurNumberField="blurNumberField" bind:openPackageBox="openPackageBox" bind:commit="editItems"validFlag='{{true}}' bind:openChoose="openChoose">
 </dk-popup> 
  
 <dk-popup wx:if="{{ billType == 'out' }}" stepperDecimal="decimalPlaces" type="sale" descCol="skuName" titleTagCol="brandName" titleCol="skuModel" iconCol="imagesUrl" subCol="calculationFormula" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="" contentObj="{{popContent}}" bind:changeStep="changeStep" bind:changeField="changeField" bind:blurNumberField="blurNumberField" bind:openPackageBox="openPackageBox" bind:commit="editItems">

package-base-select/pages/web-view-select/web-view-select.js

@@ -63,15 +63,25 @@ Page({
             })
             wx.navigateBack({
               delta: 1,
-            })
-            // 如果有值就打开文档
-            wx.openDocument({
-              filePath: filePath,
-              showMenu: true,
-              fileType: 'pdf',
-              success: function (reso) {
+              complete(cplt) {
+                // 如果有值就打开文档
+                wx.openDocument({
+                  filePath: filePath,
+                  showMenu: true,
+                  fileType: 'pdf',
+                  success: function (reso) {
+                    console.log('openDocument-success',reso);
+                  }, 
+                  fail(err) {
+                    console.log('openDocument-fail',err);
+                  },
+                  complete(cplt) {
+                    console.log('openDocument-complete',cplt);
+                  },
+                })
               }
             })
+
           }
         }
       }, fail(err) {

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

@@ -583,7 +583,8 @@ Page({
                 item.costAmt = item.intoingAmt
             })
         }
-
+        params.deleteItemList = params.deleteList ? params.deleteList : [] 
+        params.deleteItemList =  params.deleteItemList.filter(it=>it.itemId != null);
         // 系统参数
         params.flgHandleSetting = this.data.flgHandleSetting
         params.orgId = formData.orgId  //组织部门
@@ -611,6 +612,7 @@ Page({
         params.itemList = formData.goodsList //商品明细
         params.annexPaths = formData.annexPaths || [] //附件 
         params.limitEdit = true
+        delete params['deleteList']
         return params
     },
 

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

@@ -3,7 +3,7 @@
 
 <loading wx:if="{{loading}}"></loading>
 
-<dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"   titleCol="skuModel" descCol="skuName"   priceCol="priceInto" pupPriceCol="sumPrice" iconCol="imagesUrl"  quantityCol="{{quantityCol}}" sumQuantityCol="{{sumQuantityCol}}" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}" bind:clickAttach="clickAttach"  bind:uploadSucess="uploadSucess" bind:uploadError="uploadError"
+<dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"   titleCol="skuModel" descCol="skuName"   priceCol="priceInto" pupPriceCol="sumPrice" iconCol="imagesUrl"  quantityCol="{{quantityCol}}" sumQuantityCol="{{sumQuantityCol}}" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}" bind:clickAttach="clickAttach"  bind:uploadSucess="uploadSucess" bind:uploadError="uploadError"deleteName="deleteItemList" 
 bind:delItem="setGoods" bind:setGoods="setGoods"validFlag="{{true}}">
 </dk-form-bill>
 <view style="height: 200rpx;"></view>

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

@@ -370,6 +370,20 @@ Page({
         title: '编辑供应商付款',
       })
       this.getRpForUpdate(this.data.id)
+    }else{
+      if(this.data.formReturnMode == 'supplier'){
+        let item = this.data.item
+        //供应商详情跳转来的 新建 
+        formData.supId = item.supId
+        formData.supName = item.supName
+        formData.objInfo = {
+          supId: item.supId,
+          supName: item.supName,
+          payableResidue: item.payableResidue,
+          paymentResidue: item.paymentResidue,
+          arrearsResidue:Number(item.payableResidue - item.paymentResidue)
+        }
+      }
     }
     this.setData({
       formData: JSON.stringify(formData)

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

@@ -669,6 +669,11 @@ Page({
             formdata.pickupDate = this.getTomorrowsDateString()
             formdata.whId = app.globalData.user.defaultWhId
             formdata.whName = app.globalData.user.defaultWhName
+            if(this.data.formReturnMode == 'supplier'){
+              //供应商详情跳转来的 新建  formdata 是小写的 注意
+              formdata.supId = this.data.item.supId
+              formdata.supName = this.data.item.supName
+            }
             this.setData({
                 dataTime: dataTime,
                 formData: JSON.stringify(formdata)

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

@@ -490,6 +490,15 @@ Page({
     if (this.data.formMode != Constants.formMode.edit) {
       let formData = JSON.parse(this.data.formData)
       formData.intoDate = utils.formatDayTime(new Date())
+      if(this.data.formReturnMode == 'supplier'){
+        //供应商详情跳转来的 新建
+        formData.supId = this.data.item.supId
+        formData.supName = this.data.item.supName
+        formData.address = {
+          address: this.data.item.returnAddress,
+          addressFull: this.data.item.returnAddress
+        }
+      }
       //设置业务员业务部门
       this.setStaffOrg()
       this.setData({

package-purchase/pages/supplier-list/detail/detail.js

@@ -80,11 +80,11 @@ Page({
   },
 
 
-   /**
-   * @desc : 收款记录
-   * @date : 2024/2/1 15:49
-   * @author : 于继渤
-   */
+  /**
+  * @desc : 收款记录
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
   getPayRecords(supId, type) {
     let params = {}
     params.objectId = supId
@@ -93,7 +93,7 @@ Page({
     this.setData({
       loading: true
     })
-    this.excute(this.data.supReceiptPaymentService, this.data.supReceiptPaymentService.getRpSupList , params).then(res => {
+    this.excute(this.data.supReceiptPaymentService, this.data.supReceiptPaymentService.getRpSupList, params).then(res => {
       if (res.data.code == 200) {
         this.setData({
           loading: false
@@ -112,7 +112,11 @@ Page({
       }
     })
   },
-
+  /**
+  * @desc : 采购订单
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
   getPurchaseList(supId) {
     let params = {}
     params.supId = supId
@@ -144,8 +148,12 @@ Page({
     })
   },
 
-
-  getInboundProcessing(supId,type){
+  /**
+  * @desc : 查询入库
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
+  getInboundProcessing(supId, type) {
     let params = {}
     params.supId = supId
     params.flgValid = true
@@ -200,27 +208,27 @@ Page({
   * @date : 2024/2/1 15:49
   * @author : 于继渤
   */
- changeTag(e) {
-  //体验跳转显示假数据
-  if(this.data.params && this.data.params.testFlag){
-    return
-  }else{
-    let data = this.data.item
-    let name = e.detail.name
-    this.setData({
-      activeCard: e.detail.name
-    })
-    if (name == 'purchase') {
-      this.getPurchaseList(data.supId)
-    }
-    else if (name == 'purchase-out') {
-      this.getInboundProcessing(data.supId, Constants.intoType.pur)
-    }
-    else if (name == 'purchase-return') {
-      this.getInboundProcessing(data.supId, Constants.intoType.saleReturn)
+  changeTag(e) {
+    //体验跳转显示假数据
+    if (this.data.params && this.data.params.testFlag) {
+      return
+    } else {
+      let data = this.data.item
+      let name = e.detail.name
+      this.setData({
+        activeCard: e.detail.name
+      })
+      if (name == 'purchase') {
+        this.getPurchaseList(data.supId)
+      }
+      else if (name == 'purchase-out') {
+        this.getInboundProcessing(data.supId, Constants.intoType.pur)
+      }
+      else if (name == 'purchase-return') {
+        this.getInboundProcessing(data.supId, Constants.intoType.saleReturn)
+      }
     }
-  }
-},
+  },
 
   /**
     * @desc : 给表单赋值
@@ -231,12 +239,147 @@ Page({
     this.setData({
       item: data
     })
-    // 查询客户跟进
-    // if (this.data.gradeCode == Constants.gradeCode.PRO) {
-    //   this.getCusFollowList(this.data.id)
-    // }
+  },
+
+  /**
+   * @desc : 跳转查看采购订单源单
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  toOrderDetail(e) {
+    //体验跳转显示假数据
+    if (this.data.params && this.data.params.testFlag) {
+      return
+    } else {
+      let item = e.currentTarget.dataset.item
+      this.setData({
+        selectflag: true
+      })
+      let route = this.data.route
+      let that = this
+      wx.navigateTo({
+        url: route.purDetail.url,
+        events: {
+          // 保存成功后刷新页面
+          refresh: function (data) {
+
+          }
+        },
+        success: function (res) {
+          // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+          res.eventChannel.emit('params', { id: item.purId, item: item, formMode: Constants.formMode.edit, formReturnMode: 'supplier' })
+        }
+      })
+    }
   },
   /**
+  * @desc : 跳转采购退货源单
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
+  toOrderOutReturnDetail(e) {
+    let item = e.currentTarget.dataset.item
+    this.setData({
+      selectflag: true
+    })
+    let route = this.data.route
+    let that = this
+    wx.navigateTo({
+      url: route.purRetuenDetail.url,
+      events: {
+        // 保存成功后刷新页面
+        refresh: function (data) {
+
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', { id: item.intoId, formMode: Constants.formMode.edit, formType: Constants.formMode.detail, formReturnMode: 'supplier' })
+      }
+    })
+  },
+
+
+  /**
+ * @desc : 跳转查看收款源单
+ * @date : 2024/2/1 15:49
+ * @author : 于继渤
+ */
+  toOriginalCollection(e) {
+    let item = e.currentTarget.dataset.item
+    this.setData({
+      selectflag: true
+    })
+    let method = null;
+    let route = this.data.route
+    // 标准版跳转客户收款
+    if (this.data.gradeCode == Constants.gradeCode.STD) {
+      if (item.rpType == Constants.rpType.returnPayment) {
+        method = 'refundDetail'
+      } else {
+        method = 'receiptDetail'
+      }
+    } else {
+      method = 'refundDetail'
+    }
+    let url = route[method].url
+    let that = this
+    if (!url) return;
+    wx.navigateTo({
+      url: url,
+      events: {
+        // 保存成功后刷新页面
+        refresh: function (data) {
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', { id: item.rpId, formMode: Constants.formMode.other, formReturnMode: 'supplier' })
+      }
+    })
+  },
+
+
+
+  /**
+   * @desc : 跳转
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  toJump(e) {
+    //体验跳转显示假数据
+    let key = e.currentTarget.dataset.key
+    let url = null
+    let gradeCode = this.data.gradeCode
+    if (key == 'sale') {
+      url = this.data.route.toPurOrder.url
+    }
+    else if (key == 'receipt') {
+      if (gradeCode == Constants.gradeCode.STD) { //标准
+        url = this.data.route.toPurReceipt.url
+      } else if (gradeCode == Constants.gradeCode.PRO) {
+        // url = this.data.route.toReceipt.url
+      }
+    }
+    else if (key == 'saleReturn') {
+      url = this.data.route.toPurOrderReturn.url
+    }
+    let that = this
+    wx.navigateTo({
+      url: url,
+      events: {
+        // 保存成功后刷新页面
+        refresh: function (data) {
+        }
+      },
+      success: function (res) {
+        res.eventChannel.emit('params', { id: that.data.item.supId, item: that.data.item, formType: Constants.formMode.add, formMode: Constants.formMode.add ,formReturnMode: 'supplier'});
+      }
+    })
+  },
+
+
+  /**
   * @desc : 初始加载
   * @date : 2024/5/24 15:49
   * @author : 周兴
@@ -245,12 +388,7 @@ Page({
     if (this.data.gradeCode == Constants.gradeCode.STD) {
 
     }
-
-    let e = {
-      detail: {
-        name: 'deal'
-      },
-    }
+    let e = { detail: { name: 'deal' } }
     this.onChange(e);
 
   },

package-purchase/pages/supplier-list/detail/detail.wxml

@@ -477,9 +477,9 @@
                     <view slot="price">
                       <view style="display: flex;width: 100%;flex-direction: row;">
                         <view style="color: red;font-size: 14px;width: 100%;">
-                          <dk-cell center="left" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{cItem.intoAmt}}"></dk-cell>
+                          <dk-cell center="left" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{cItem.returnAmt}}"></dk-cell>
                         </view>
-                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{cItem.intoQty + (cItem.packBoxText? ('(' + cItem.packBoxText + ')'):'')}}</span></view>
+                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{cItem.returnQty + (cItem.packBoxText? ('(' + cItem.packBoxText + ')'):'')}}</span></view>
                       </view>
                     </view>
                   </van-card>

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

@@ -942,8 +942,10 @@ Page({
                   res.invId = it.invId
                   res.invQty = it.invQty ? it.invQty : 0
                   //销售订单、销售出库、采购退货-自动出库或者办理时要读取系统参数【欠货开单】开启就不判断库存，调取后台自动生成对应入库单
-                  if (this.data.flgHandleSetting) { } else {
-                    res['itemQty_max'] = res.invQty
+                  if (!this.data.flgHandleSetting) {  
+                    if (this.data.formMode != Constants.formMode.edit) { //编辑 不要设置 bug 7351  销售订单-编辑-改数量在点抽屉值不一样
+                      res['itemQty_max'] = res.invQty
+                    } 
                   }
                   res['itemQty_min'] = 1
 
@@ -1480,8 +1482,29 @@ Page({
       }
       //客户接待过来的
       if (data.formItem) {
+        let item = JSON.parse(data.formItem) 
+        formData.cusCode = item.cusCode
+        formData.cusId = item.cusId
+        formData.cusName = item.cusName
+        formData.cusPhone = item.cusPhone
+        formData.cusFromName = item.cusFromName
+        formData.cusFrom = item.cusFrom
+        //处理地址
+        formData.address = {
+          address: item.addressFull,
+          addressFull: item.addressFull,
+          addressArea: item.addressArea,
+          addressGcj02: item.addressGcj02,
+          addressName: item.addressName,
+        }
+        formData.addressArea = item.addressArea
+        formData.addressFull = item.addressFull
+        formData.addressGcj02 = item.addressGcj02
+        formData.addressName = item.addressName
+        formData.addressNo = item.addressNo
         that.setData({
-          item: data.formItem
+          formData: JSON.stringify(formData),
+          item: item
         })
       }
       // 设置客户信息
@@ -1548,64 +1571,78 @@ Page({
     })
   },
   /**
-   * @desc : 计算商品金额
-   * @date : 2024/5/24 15:49
-   * @author : 周兴
-   */
-  setGoodsAmount(formData) {
-    let cardList = this.data.cardList
-
-    let index = cardList.findIndex(it => it.name == 'items');
-    if (formData.goodsList && formData.goodsList.length > 0) {
-      let sumStandard = Number(0)
-      let sumAmount = Number(0)
-      let sumQuantity = Number(0)
-      formData.goodsList.forEach(item => {
-        //标价合计 =  商品标价 x  商品数量
-        item.priceStd = item.priceStd ? item.priceStd : (item.priceStandard ? item.priceStandard : 0) //标价
-        item.amtStd = Number(item.priceStd * item.itemQty) //合计标价金额
-        item.priceSale = item.priceSale ? item.priceSale : item.priceStandard
-        item.itemAmt = item.priceSale * item.itemQty //商品金额
-        item.priceDiscount = item.priceStd ? Number((item.priceSale / item.priceStd) * 100).toFixed(2) : 100 //售价折扣
-        sumQuantity += item.itemQty //数量
-        sumAmount += item.priceSale * item.itemQty //没有售价默认取标价 
-        sumStandard += (item.priceStd ? item.priceStd : item.priceStandard) * item.itemQty
+     * @desc : 设置商品明细金额相关信息 TODO 
+     * @author : 周兴
+     * @date : 2024/1/19
+     */
+    setGoodsAmount(formdata) {
+      let cardList = this.data.cardList
+      let form = formdata
+      let index = cardList.findIndex(it => it.name == 'items');
+      if (form.goodsList && form.goodsList.length > 0) {
+        let sumStandard = Number(0)
+        let sumAmount = Number(0)
+        let factAmt = Number(0)
+        let sumQuantity = Number(0)
+        form.goodsList.forEach(item => {
+          //标价合计 =  商品标价 x  商品数量
+          item.priceStd = Number(item.priceStd ? item.priceStd : (item.priceStandard ? item.priceStandard : 0)) //标价
+          item.amtStd = Number(item.priceStd * item.itemQty) //合计标价金额
+          item.priceSale = Number(item.priceSale ? item.priceSale : item.priceStandard)
+          item.factPrice = Number(item.factPrice ? item.factPrice : item.priceSale) 
+          if (item.flgGift) { //赠品
+            item.priceSale = Number(0)
+            item.factPrice = Number(0) 
+          }
+          item.itemAmt = Number(item.priceSale) * Number(item.itemQty) //商品金额
+          item.sumPrice = Number(item.priceSale) * Number(item.itemQty) //商品金额
+          item.priceDiscount = item.priceStd ? Number((Number(item.priceSale) / Number(item.priceStd)) * 100).toFixed(2) : 100 //售价折扣  
+          item.factAmt = Number(item.factPrice) * Number(item.itemQty)
+          sumQuantity += Number(item.itemQty) //数量
+          sumAmount += Number(item.priceSale) * Number(item.itemQty) //没有售价默认取标价
+          factAmt += Number(item.factAmt)
+          sumStandard += Number((item.priceStd ? item.priceStd : item.priceStandard)) * Number(item.itemQty)
+        })
+        //标价合计
+        cardList[index].sumStandard = sumStandard
+        //销售折扣 (合计金额/标价合计)
+        cardList[index].saleDiscount = sumStandard ? Number((sumAmount / sumStandard) * 100).toFixed(2) : 100
+        //合计金额
+        cardList[index].sumAmount = sumAmount
+        cardList[index].sumQuantity = sumQuantity
+        //TODO   需要获取当前客户可用预存
+        cardList[index].canUseCollect = 0 //可用
+        cardList[index].useCollect = 0 //使用 
+        form.factAmt = factAmt
+        form.sumStandard = sumStandard
+        form.saleDiscount = cardList[index].saleDiscount
+        form.sumAmount = sumAmount
+        form.canUseCollect = 0
+        form.useCollect = 0
+        form.sumQuantity = sumQuantity
+        form.discount = 100 //整单折扣
+        form.discAmt = 0 //优惠金额
+      } else {
+        cardList[index].sumStandard = 0
+        cardList[index].saleDiscount = 0
+        cardList[index].sumAmount = 0
+        cardList[index].canUseCollect = 0
+        cardList[index].useCollect = 0
+
+        form.sumStandard = 0
+        form.saleDiscount = 0
+        form.sumAmount = 0
+        form.canUseCollect = 0
+        form.useCollect = 0
+        form.factAmt = 0
+        form.discount = 100 //整单折扣
+        form.discAmt = 0 //优惠金额
+      }
+      this.setData({
+        cardList: cardList,
       })
-      //标价合计
-      cardList[index].sumStandard = sumStandard
-      //销售折扣 (合计金额/标价合计)
-      cardList[index].saleDiscount = sumStandard ? Number((sumAmount / sumStandard) * 100).toFixed(2) : 100
-      //合计金额
-      cardList[index].sumAmount = sumAmount
-      cardList[index].sumQuantity = sumQuantity
-      //TODO   需要获取当前客户可用预存
-      // cardList[index].canUseCollect = 0  //可用
-      // cardList[index].useCollect = 0  //使用
-      formData.sumStandard = sumStandard
-      formData.saleDiscount = cardList[index].saleDiscount
-      formData.sumAmount = sumAmount
-      // formData.canUseCollect = 0
-      // formData.useCollect = 0
-      formData.sumQuantity = sumQuantity
-    } else {
-      cardList[index].sumStandard = 0
-      cardList[index].saleDiscount = 0
-      cardList[index].sumAmount = 0
-      cardList[index].canUseCollect = 0
-      cardList[index].useCollect = 0
-
-      formData.sumStandard = 0
-      formData.saleDiscount = 0
-      formData.sumAmount = 0
-      formData.canUseCollect = 0
-      formData.useCollect = 0
-    }
-
-    this.setData({
-      cardList: cardList,
-      formData: JSON.stringify(formData)
-    })
-  },
+      return form
+    },