王英杰 před 1 rokem
rodič
revize
9defcea921

+ 2 - 0
components/dkbase/dk-popup/dk-popup.wxml

@@ -70,7 +70,9 @@
       </van-field>
       <!--数量step-->  
       <van-cell wx:if="{{item.type=='step'}}" border="{{ false }}" title-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}"  title="{{item.title?item.title:'数量'}}" required="{{item.required?true:false }}">
+      <!-- 箱片 专用 stepper-->
         <van-stepper wx:if="{{item.code == 'box'}}"input-width="50px" value="{{form[item.code]}}" integer="{{true}}"  data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:-9999999999)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
+   <!-- 除了箱片 正常用的 stepper-->
         <van-stepper wx:else value="{{form[item.code]}}" input-width="50px" integer="{{ form[stepperDecimal]==0}}"decimal-length="{{ form[stepperDecimal] }}" data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:-99999999999)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}"/>
       </van-cell>
       <!--显示负数step-->  

+ 17 - 2
package-sales/pages/order-billing/add/add.js

@@ -285,9 +285,14 @@ Page({
    * @author : 于继渤
    */
   openReverseCalculationPop() {
+    
     let formData = JSON.parse(this.data.formData)
     let goodsListAmt = formData.goodsList.sum("priceSale")
-    if ((formData.goodsList.length <= 0) || goodsListAmt == 0) { //没有商品不能点开折扣反算
+    if ((formData.goodsList.length <= 0) || goodsListAmt == 0) { //没有商品或者价格都是零的时候不能点开折扣反算
+      return
+    }
+    //受 销售订单编辑逻辑 限制 转出库后(订单上的出库中加上已出库数量大于0 即证明有后续出库) 不能弹出总单反算pop 
+      if (formData.outingQty&&formData.outQty&&(Number(formData.outingQty)+Number(formData.outQty))>0) {  
       return
     }
     let cardList = this.data.cardList
@@ -857,7 +862,7 @@ Page({
         });
       }, 200)
     }
-    this.loadInit()
+    this.loadInit() //初始化数据
     let cardList = this.data.cardList
     let index = cardList.findIndex(it => (it.name == "items"))
     if (index >= 0) {
@@ -958,6 +963,16 @@ Page({
     if (index_receivable != -1) {
       contentSaveList[index_receivable]['content'] = data.sumAmount
     }
+    //受 销售订单编辑逻辑 限制 转出库后(订单上的出库中加上已出库数量大于0 即证明有后续出库) 不能删除明细 不能修改明细金额 明细数量不能小于已转出库数量 
+    data.goodsList.forEach(element => {
+      if (element.outingQty&&element.outQty&&(Number(element.outingQty)+Number(element.outQty))>0) {  
+        element['itemQty_max'] = 9999999999
+        element['itemQty_min'] =  Number(element.outingQty)+Number(element.outQty)
+        element.cannotModifyFlag = true
+      }
+    });
+  
+    
     this.setData({
       cardList: cardList,
       formData: JSON.stringify(data),

+ 1 - 1
utils/util.js

@@ -784,7 +784,7 @@ function showToast(info,duration = 2000) {
  * @author : 周兴
  * @date   : 2024/1/26 11:46
  */
-function handleQty(qty,decimalPlace = 0){
+function handleQty(qty,decimalPlace = 2){
   // decimalPlace = decimalPlace?decimalPlace:0  
   // return Number(Number(qty).toFixed(decimalPlace))
   console.log('handleQty',qty);