附件和 明细的最大值小智

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

@@ -142,7 +142,7 @@ Page({
         },
         // 路由
         routeObjName: 'outboundOther',
-
+        table: Constants.tables.t_psi_outbound,
     },
     /**
      * @desc   : 绑定数据-选择页面返回的逻辑处理

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

@@ -3,7 +3,7 @@
 
 <loading wx:if="{{loading}}" ></loading>
 
-<dk-form-bill type="out" id="{{formName}}"routeObjName="{{routeObjName}}" 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" bind:editItems="setGoods" 
+<dk-form-bill type="out" id="{{formName}}"routeObjName="{{routeObjName}}" 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" bind:editItems="setGoods"  table="{{table}}"
 bind:delItem="setGoods" bind:setGoods="setGoods"
 cardContentList="{{cardContentList}}"
 quantityRedTitle="可售量："

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

@@ -144,6 +144,7 @@ Page({
         },
         // 路由
         routeObjName: 'inboundOther', 
+        table: Constants.tables.inbound,
 
     },
     /**

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

@@ -3,7 +3,7 @@
 
 <loading wx:if="{{loading}}"></loading>
 
-<dk-form-bill type="pur" id="{{formName}}" routeObjName="{{routeObjName}}" 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" bind:editItems="setGoods" 
+<dk-form-bill type="pur" id="{{formName}}" routeObjName="{{routeObjName}}" 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" bind:editItems="setGoods" table="{{table}}"
 bind:delItem="setGoods" bind:setGoods="setGoods">
 </dk-form-bill>
 <view style="height: 200rpx;"></view>

package-inventory/pages/outbound-processing/detail/detail.js

@@ -69,6 +69,7 @@ Page({
     outboundSaleReturnService: app.globalData['outboundSaleReturnService'],
     // 主键Id
     primaryKey: 'outId',
+    table: Constants.tables.t_psi_outbound,
   },
   /**
    * @desc : dk-from choose 回调事件
@@ -150,8 +151,14 @@ Page({
     contentList_[1].content = sumitemAmt
 
     // 明细的最大出库办理的量
-    data.goodsList.forEach(element => {
-      element.outingQtyMax = element.outingQty
+    data.goodsList.forEach(element => { 
+      if (this.data.item.outType == Constants.outType.purReturn) {
+        element['outingQty_max'] = -1
+        element['outingQty_min'] = -1 * Math.abs(element.outingQty)
+    } else {
+        element['outingQty_max'] = element.outingQty
+        element['outingQty_min'] = 1
+    }
       // 显示库区和可售量开关
       element.usableQtyInsufficientFlag = true
     })
@@ -244,9 +251,9 @@ Page({
         })
         return false
       }
-      if (element.outingQty > element.outingQtyMax) {
+      if (element.outingQty > element.outingQty_max) {
         wx.showToast({
-          title: "[" + element.skuCode + "]" + mixins.$t("maxCount") + element.outingQtyMax,
+          title: "[" + element.skuCode + "]" + mixins.$t("maxCount") + element.outingQty_max,
           icon: 'none'
         })
         return false

package-inventory/pages/outbound-processing/detail/detail.wxml

@@ -56,7 +56,7 @@
   </view>
 </view>
 
-<dk-form-bill id="{{formName}}" type="out" routeObjName="{{routeObjName}}" readonly="{{formType==2}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="outingAmt" quantityCol="outingQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale"
+<dk-form-bill id="{{formName}}" type="out" routeObjName="{{routeObjName}}" readonly="{{formType==2}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="outingAmt" quantityCol="outingQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" table="{{table}}"
 bind:editItems="setGoods" bind:delItem="setGoods" bind:setGoods="setGoods"
 cardContentList="{{cardContentList}}"
 quantityRedTitle="可售量："

package-inventory/pages/warehousing-processing/detail/detail.js

@@ -66,6 +66,7 @@ Page({
         inboundPurchaserReturnService: app.globalData['inboundPurchaserReturnService'],
         // 主键Id
         primaryKey: 'intoId',
+        table: Constants.tables.inbound,
     },
     /**
      * @desc : dk-from choose 回调事件
@@ -146,7 +147,13 @@ Page({
 
         // 明细的最大入库办理的量
         data.goodsList.forEach(element => {
-            element.intoingQtyMax = element.intoingQty
+            if (this.data.item.intoType == Constants.intoType.saleReturn) {
+                element['intoingQty_max'] = -1
+                element['intoingQty_min'] = -1 * Math.abs(element.intoingQty)
+            } else {
+                element['intoingQty_max'] = element.intoingQty
+                element['intoingQty_min'] = 1
+            }
         })
 
         // 刷新商品明细 显示 查看更多
@@ -236,9 +243,9 @@ Page({
                 })
                 return false
             }
-            if (element.intoingQty > element.intoingQtyMax) {
+            if (element.intoingQty > element.intoingQty_max) {
                 wx.showToast({
-                    title: "[" + element.skuCode + "]" + mixins.$t("maxCount") + element.intoingQtyMax,
+                    title: "[" + element.skuCode + "]" + mixins.$t("maxCount") + element.intoingQty_max,
                     icon: 'none'
                 })
                 return false
@@ -256,7 +263,7 @@ Page({
         let formData = JSON.parse(this.data.formData)
         params.allEdit = true //大编辑
         // 由于办理后直接生成出库单，将画面的删除的数据放入deleteItemList数组中
-        params.deleteItemList = formData.deleteList  || []
+        params.deleteItemList = formData.deleteList || []
 
         params.fromId = formData.fromId  //来源id
         params.fromNo = formData.fromNo  //来源单号

package-inventory/pages/warehousing-processing/detail/detail.wxml

@@ -56,7 +56,7 @@
   </view>
 </view>
 
-<dk-form-bill id="{{formName}}" routeObjName="{{routeObjName}}" readonly="{{item.intoStatus == $t['inBoundedIntoStatus']}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="intoingAmt" quantityCol="intoingQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" bind:delItem="setGoods" bind:setGoods="setGoods" priceTitle="{{$t['wholesalePrice']}}：">
+<dk-form-bill id="{{formName}}" routeObjName="{{routeObjName}}" readonly="{{item.intoStatus == $t['inBoundedIntoStatus']}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="intoingAmt" quantityCol="intoingQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}" bind:delItem="setGoods" bind:setGoods="setGoods" priceTitle="{{$t['wholesalePrice']}}：">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

pages/add-company/add-company.js

@@ -50,11 +50,11 @@ Page({
         clearInterval(this.data.interval)
     },
 
-   /**
-   * @desc : 获取二维码
-   * @date : 2022/5/12 13:49
-   * @author : 姜永辉
-   */
+    /**
+    * @desc : 获取二维码
+    * @date : 2022/5/12 13:49
+    * @author : 姜永辉
+    */
     loadQrCodeData() {
         let _this = this
         let param = {
@@ -64,7 +64,7 @@ Page({
             console.log("getQrCode", res);
             if (res.data.code == Constants.SUCESS_CODE) {
                 this.setData({
-                    imgQrcode: config.server_add + ':' + config.file_server_port + res.data.data
+                    imgQrcode: config.image_url + res.data.data
                 })
             }
         })