出入库

api/pages/ivt/outbound.js

@@ -16,7 +16,7 @@ module.exports = {
 
   routeUrl: {
     outbound: { 
-      returnCancel: { key: 'returnCancel', method: 'returnCancel' },
+      returnCancel: { key: 'returnCancel', method: 'returnCancel' ,image: 'btn-void.png',question:true},
       invaidOrder: { key: 'invaidOrder', method: 'invaidOrder',image: 'btn-void.png' },
       editOrder: { key: 'editOrder', method: 'editOrder', primaryKey: 'outId',image: 'btn-edit.png' },
       ticketPirnt: { key: 'ticketPirnt', method: 'ticketPirnt', primaryKey: 'outId', image: 'btn-printing.png'}, 

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

@@ -195,28 +195,13 @@ Page({
     * @author : 姜永辉
     */
     setValuesByEdit(data) {
+        let that = this
         let cardList_ = this.data.cardList
         let contentList_ = this.data.contentList
         let sumitemAmt = 0
         let sumitemquantity = 0
         let formType = this.data.formType
-        //  入库状态-已入库
-        if (data.intoStatus == Constants.intoStatus.inBounded) {
-            //查询采购订单表 未入库的 详细 
-            this.setData({
-                buttonList: [{
-                    name: 'merge',
-                    title: mixins.$t("close")
-                }],
-            })
-        } else {
-            this.setData({
-                buttonList: [{
-                    name: 'merge',
-                    title: mixins.$t("inProcessing")
-                }],
-            })
-        }
+         
         sumitemquantity = Number(data.intoingQty)
         sumitemAmt = Number(data.intoingQty) * Number(data.intoingAmt)
         cardList_.forEach(card => {
@@ -241,7 +226,7 @@ Page({
         }
         // 明细的最大入库办理的量
         data.goodsList.forEach(element => {
-            if (this.data.item.intoType == Constants.intoType.saleReturn) {
+            if (that.data.item.intoType == Constants.intoType.saleReturn) {
                 element['intoingQty_max'] = -1
                 element['intoingQty_min'] = -1 * Math.abs(element.intoingQty)
             } else {

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

@@ -205,18 +205,7 @@ Page({
     this.setData({
       active: index,
     })
-    let buttonList = this.data.buttonList
-    buttonList = buttonList.filter(item => item.name !== 'returnCancel')
-    console.log();
-    if (index == 1 && buttonList.length == 3) {
-      buttonList.push({
-        name: 'returnCancel',
-        title: mixins.$t('returnCancel'),
-      })
-    }
-    this.setData({
-      buttonList,
-    })
+     
     this.searchData()
   },
   /**
@@ -361,6 +350,84 @@ Page({
 
   },
 
+    /**
+  * @desc : 三个小点点击回调
+  * @date : 2024年3月8日
+  * @author : 姜永辉
+  */
+ toPoint(e) {
+  console.log("toPoint", e);
+  let item = e.detail.item
+  if (item.flgValid) {
+    // 待入库
+    if (this.data.active == 0) {
+      this.setData({
+        buttonList: [
+          {
+            name: 'editOrder',
+            title: mixins.$t('edit'),
+          },
+          {
+            name: 'invaidOrder',
+            title: mixins.$t('invaidOrder'),
+
+          }, {
+            name: 'ticketPirnt',
+            title: mixins.$t('ticketPirnt'),
+          }
+        ],
+      })
+    } else {
+      // 参数自动出入库：作废显示没有撤回
+      if (item.flgHandleSetting == "true") {
+        this.setData({
+          buttonList: [
+            {
+              name: 'editOrder',
+              title: mixins.$t('edit'),
+            },
+            {
+              name: 'invaidOrder',
+              title: mixins.$t('invaidOrder'),
+
+            }, {
+              name: 'ticketPirnt',
+              title: mixins.$t('ticketPirnt'),
+            }
+          ],
+        })
+      } else {
+        // 参数手动出入库：撤回显示没有作废
+        this.setData({
+          buttonList: [
+            {
+              name: 'editOrder',
+              title: mixins.$t('edit'),
+            },
+            {
+              name: 'ticketPirnt',
+              title: mixins.$t('ticketPirnt'),
+            },
+            {
+              name: 'returnCancel',
+              title: mixins.$t('returnCancel'),
+            }
+          ],
+        })
+      }
+
+    }
+  } else {
+    this.setData({
+      // 弹出按钮
+      buttonList: [{
+        name: 'ticketPirnt',
+        title: mixins.$t('ticketPirnt') //打印票据
+      }],
+    })
+  }
+},
+
   /**
    * @desc : （撤销）
    * @date : 2024/2/1 15:49

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

@@ -67,6 +67,9 @@ Page({
         // 主键Id
         primaryKey: 'intoId',
         table: Constants.tables.inbound,
+        quantityCol: 'intoingQty',
+        sumAmountCol: 'itemAmt',
+        sumQuantityCol: 'intoingQty',
     },
     /**
      * @desc : dk-from choose 回调事件
@@ -110,35 +113,38 @@ Page({
     setValuesByEdit(data) {
         let cardList_ = this.data.cardList
         let contentList_ = this.data.contentList
-        let sumitemAmt = 0 
+        let sumitemAmt = 0
         let sumitemquantity = 0
         // data.makeTime = data.makeTime.substring(0, 10)
         // 入库对象
         if (data.intoType == Constants.intoType.other) {
-            data.intoObject = (data.supId!=null)?data.supId:data.cusId
-            data.intoObjectName = (data.supplierName!=null)?data.supplierName:data.cusName
-        }       
+            data.intoObject = (data.supId != null) ? data.supId : data.cusId
+            data.intoObjectName = (data.supplierName != null) ? data.supplierName : data.cusName
+        }
         //  入库状态-已入库
         if (data.intoStatus == Constants.intoStatus.inBounded) {
             //查询采购订单表 未入库的 详细 
             this.setData({
-                readonly:true,
+                readonly: true,
                 buttonList: [{
                     name: 'merge',
                     title: mixins.$t("close")
                 }],
             })
+            sumitemAmt = Number(data.intoAmt)
+            sumitemquantity = Number(data.intoQty)
         } else {
-            readonly:false,
-            this.setData({
-                buttonList: [{
-                    name: 'merge',
-                    title: mixins.$t("inProcessing")
-                }],
-            })
-        } 
-        sumitemAmt =   Number(data.intoingAmt)
-        sumitemquantity =   Number(data.intoingQty)
+            readonly: false,
+                this.setData({
+                    buttonList: [{
+                        name: 'merge',
+                        title: mixins.$t("inProcessing")
+                    }],
+                })
+            sumitemAmt = Number(data.intoingAmt)
+            sumitemquantity = Number(data.intoingQty)
+        }
+
         cardList_.forEach(card => {
             if (card.name === 'items') {
                 if (data.intoStatus == Constants.intoStatus.inBounding) {
@@ -149,7 +155,12 @@ Page({
                     card.color = "#1B365D"
                 }
                 card.itemAmt = sumitemAmt
-                card.intoingQty = sumitemquantity
+                //  入库状态-已入库
+                if (data.intoStatus == Constants.intoStatus.inBounded) {
+                    card.intoQty = sumitemquantity
+                }else{
+                    card.intoingQty = sumitemquantity
+                }                
             }
         })
         contentList_[1].content = sumitemAmt
@@ -196,7 +207,7 @@ Page({
         formData.goodsList.forEach(element => {  //循环出商品总共价格   
             element.intoingAmt = element.priceInto * element.intoingQty
             totalAmout += Number(element.priceInto * element.intoingQty)
-            totalQuantity += Number( element.intoingQty)
+            totalQuantity += Number(element.intoingQty)
         })
         // 左下角的合计金额
         contentList_.forEach(card => {
@@ -534,6 +545,18 @@ Page({
                 title: mixins.$t('purReturnOutBound'),
             })
         }
+
+        if (this.data.item.intoStatus == Constants.intoStatus.inBounding) {
+            this.setData({
+                quantityCol: 'intoingQty',
+                sumQuantityCol: 'intoingQty',
+            })
+        } else {
+            this.setData({
+                quantityCol: 'intoQty',
+                sumQuantityCol: 'intoQty',
+            })
+        }
     },
 
     /**

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

@@ -49,7 +49,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" sumQuantityCol="intoingQty" 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 id="{{formName}}" routeObjName="{{routeObjName}}" readonly="{{item.intoStatus == $t['inBoundedIntoStatus']}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="priceInto" pupPriceCol="pricePurchase" iconCol="imagesUrl"  quantityCol="{{quantityCol}}" sumAmountCol="itemAmt" sumQuantityCol="{{sumQuantityCol}}" 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>

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

@@ -62,7 +62,7 @@ Page({
       {
         code: 'orgName',
       },
-      { 
+      {
         code: 'flgValid',
         title: mixins.$t('flgValid'),
         dataType: 'checkbox'
@@ -156,7 +156,7 @@ Page({
         name: 'ticketPirnt',
         title: mixins.$t('ticketPirnt'),
       }
-      , 
+      ,
     ],
     // 底部保存按钮
     buttonFootList: [{
@@ -199,20 +199,7 @@ Page({
     this.setData({
       active: index,
     })
-    let buttonList = this.data.buttonList
-    buttonList = buttonList.filter(item => item.name !== 'returnCancel')
-    console.log();
-    if (index == 1 && buttonList.length == 3) {
-      buttonList.push(
-        {
-          name: 'returnCancel',
-          title: mixins.$t('returnCancel'),
-        }
-      )
-    }
-    this.setData({
-      buttonList,
-    })
+
     this.searchData()
   },
 
@@ -236,9 +223,9 @@ Page({
    * @author : 周兴
    * @date : 2024/1/22
    */
-  toDetail(e) { 
+  toDetail(e) {
     if (e) {
-      let item = e.detail.item;      
+      let item = e.detail.item;
       if (e.detail.item) {
         let button = {
           formMode: Constants.formMode.edit
@@ -341,6 +328,85 @@ Page({
       contentnFootList,
     })
   },
+
+  /**
+  * @desc : 三个小点点击回调
+  * @date : 2024年3月8日
+  * @author : 姜永辉
+  */
+  toPoint(e) {
+    console.log("toPoint", e);
+    let item = e.detail.item
+    if (item.flgValid) {
+      // 待入库
+      if (this.data.active == 0) {
+        this.setData({
+          buttonList: [
+            {
+              name: 'editOrder',
+              title: mixins.$t('edit'),
+            },
+            {
+              name: 'invaidOrder',
+              title: mixins.$t('invaidOrder'),
+
+            }, {
+              name: 'ticketPirnt',
+              title: mixins.$t('ticketPirnt'),
+            }
+          ],
+        })
+      } else {
+        // 参数自动出入库：作废显示没有撤回
+        if (item.flgHandleSetting == "true") {
+          this.setData({
+            buttonList: [
+              {
+                name: 'editOrder',
+                title: mixins.$t('edit'),
+              },
+              {
+                name: 'invaidOrder',
+                title: mixins.$t('invaidOrder'),
+
+              }, {
+                name: 'ticketPirnt',
+                title: mixins.$t('ticketPirnt'),
+              }
+            ],
+          })
+        } else {
+          // 参数手动出入库：撤回显示没有作废
+          this.setData({
+            buttonList: [
+              {
+                name: 'editOrder',
+                title: mixins.$t('edit'),
+              },
+              {
+                name: 'ticketPirnt',
+                title: mixins.$t('ticketPirnt'),
+              },
+              {
+                name: 'returnCancel',
+                title: mixins.$t('returnCancel'),
+              }
+            ],
+          })
+        }
+
+      }
+    } else {
+      this.setData({
+        // 弹出按钮
+        buttonList: [{
+          name: 'ticketPirnt',
+          title: mixins.$t('ticketPirnt') //打印票据
+        }],
+      })
+    }
+  },
+
   /**
     * @desc : （撤销）
     * @date : 2024/2/1 15:49
@@ -396,6 +462,7 @@ Page({
         success: function (res) {
           res.eventChannel.emit('params', {
             id: id,
+            item: item,
             formMode: Constants.formMode.edit
           })
         }
@@ -412,6 +479,7 @@ Page({
         success: function (res) {
           res.eventChannel.emit('params', {
             id: id,
+            item: item,
             formMode: Constants.formMode.edit
           })
         }
@@ -427,6 +495,7 @@ Page({
         success: function (res) {
           res.eventChannel.emit('params', {
             id: id,
+            item: item,
             formMode: Constants.formMode.other,
             formType: Constants.formType.edit,
           })

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

@@ -13,7 +13,7 @@
 <van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}" />
 
 <!-- 列表区 -->
-<dk-list list="{{tableData}}" contentCol="intoTypeName"  title="supplierName"   status="intoTypeName" content="{{contentList}}" contentObj="{{contentObj}}" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
+<dk-list list="{{tableData}}" contentCol="intoTypeName"  title="supplierName"   status="intoTypeName" content="{{contentList}}" contentObj="{{contentObj}}" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:toPoint="toPoint"  bind:open="open"></dk-list>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 <view style="height: 180rpx;"></view>