出库单编辑

api/pages/ivt/outbound.js

@@ -15,6 +15,7 @@ module.exports = {
 
   routeUrl: {
     outbound: { 
+      add: { key: 'add', url: '/package-sales/pages/sales-outbound/add/add'  },
       edit: { key: 'edit', url: '/package-inventory/pages/outbound-processing/detail/detail' },
       addOther: { key: 'addOther', url: '/package-inventory/pages/other-outbound/other-outbound' },
       chooseSupplier: { key: 'chooseSupplier', url: '/package-base-select/pages/select-data/select-data',type:'supplier'  },

api/pages/ivt/outboundOther.js

@@ -12,6 +12,7 @@ module.exports = {
     // 前缀
     prefix: 'mdm-server/ivt/outbound_other/',
     otheroutBoundInsert: 'outbound_insert', 
+    otheroutBoundUpdate: 'outbound_update',
     outBoundHandle:'outbound_handle',
   },
 

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

@@ -144,13 +144,83 @@ Page({
         routeObjName: 'outboundOther',
         table: Constants.tables.t_psi_outbound,
     },
+
+    /**
+  * @desc : 给表单赋值
+  * @date : 2024/2/1 15:49
+  * @author : 姜永辉
+  */
+    setValuesByEdit(data) {
+        console.log("setValuesByEdit", data);
+        let cardList_ = this.data.cardList
+        let contentList_ = this.data.contentList
+        let sumitemAmt = 0
+        let formType = this.data.formType
+        //  出库状态-已出库
+        if (data.outStatus == Constants.outStatus.unOutBound) {
+            //查询采购订单表 未出库的 详细 
+            this.setData({
+                buttonList: [{
+                    name: 'merge',
+                    title: mixins.$t("close")
+                }],
+            })
+        } else {
+            this.setData({
+                buttonList: [{
+                    name: 'merge',
+                    title: mixins.$t("outProcessing")
+                }],
+            })
+        }
+
+        sumitemAmt = Number(data.outingQty) * Number(data.outingAmt)
+        cardList_.forEach(card => {
+            if (card.name === 'items') {
+                if (formType == 1) {
+                    card.info = "（" + mixins.$t("outboundProcessing") + "）"
+                    card.color = "#E4002B"
+                } else {
+                    card.info = "（" + mixins.$t("checkouted") + "）"
+                    card.color = "#1B365D"
+                }
+                card.itemAmt = sumitemAmt
+            }
+        })
+        contentList_[1].content = sumitemAmt
+
+        // 明细的最大出库办理的量
+        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
+        })
+
+        // 刷新商品明细 显示 查看更多
+        let card = this.data.cardList.filter(it => it.name == 'items');
+        this.selectComponent('#' + this.data.formName).handleContentObj(card[0])
+
+        this.setData({
+            itemData: data,
+            cardList: cardList_,
+            contentList: contentList_,
+            formData: JSON.stringify(data),
+            sumitemAmt
+        })
+
+    },
     /**
      * @desc   : 绑定数据-选择页面返回的逻辑处理
      * @author : 姜永辉
      * @date   : 2024年3月12日
      */
     chooseData(e) {
-        console.log("t", e, this.data.formData);
         let formData = JSON.parse(this.data.formData)
         let cardList_ = this.data.cardList
         let code = e.detail.code
@@ -182,7 +252,6 @@ Page({
         })
     },
 
-
     /**
     * @desc : 外露设置产品方法 
     * @date : 2024/2/1 15:49
@@ -217,7 +286,6 @@ Page({
                 card.itemAmt = totalAmout
             }
         })
-        console.log(formData.goodsList);
         this.setData({
             contentList: contentList_,
             cardList,
@@ -231,7 +299,6 @@ Page({
      * @author : 姜永辉
      */
     validData() {
-        console.log("validData");
         let formData = JSON.parse(this.data.formData)
         if (formData.goodsList == null || formData.goodsList.length == 0) {
             wx.showToast({
@@ -258,7 +325,6 @@ Page({
                 return false
             }
         }
-        console.log("validData-true");
         return true
     },
 
@@ -270,6 +336,8 @@ Page({
     setParams(params) {
         let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
         let formData = JSON.parse(this.data.formData)
+        // 新增编辑的
+        params.outId = formData.outId
         // 总单的 出库中数量和金额合计
         params.outingAmt = formData.goodsList.sum("outingAmt")   //金额
         params.outingQty = formData.goodsList.sum("outingQty")     //一共的商品数量
@@ -296,7 +364,7 @@ Page({
             it.itemIndex = (i++)
         })
         params.itemList = formData.goodsList //商品明细
-        console.log("setParams", params);
+        params.annexPaths = formData.annexPaths || [] //附件 
         return params
     },
 
@@ -306,6 +374,10 @@ Page({
     * @author : 姜永辉
     */
     saveData() {
-        return this.excute(this.data.service, this.data.service.otheroutBoundInsert, this.data.params)
+        if (this.data.formMode == Constants.formMode.edit) {
+            return this.excute(this.data.service, this.data.service.otheroutBoundUpdate, this.data.params)
+        } else {
+            return this.excute(this.data.service, this.data.service.otheroutBoundInsert, this.data.params)
+        }
     },
 })

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

@@ -151,14 +151,14 @@ Page({
     contentList_[1].content = sumitemAmt
 
     // 明细的最大出库办理的量
-    data.goodsList.forEach(element => { 
+    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 {
+      } else {
         element['outingQty_max'] = element.outingQty
         element['outingQty_min'] = 1
-    }
+      }
       // 显示库区和可售量开关
       element.usableQtyInsufficientFlag = true
     })
@@ -271,7 +271,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  //来源单号
@@ -565,4 +565,61 @@ Page({
       })
     }
   },
+
+  /**
+ * @desc : （编辑）
+ * @date : 2024/2/1 15:49
+ * @author : 姜永辉
+ */
+  toEdit(e) {
+    let id = e.currentTarget.dataset.item.outId
+    // 销售出库
+    if (this.data.item.outType == Constants.outType.sale) {
+      wx.navigateTo({
+        url: this.data.route.add.url,
+        events: {
+          // 回调后，在这里给页面赋值
+          bandData: function (e) { }
+        },
+        success: function (res) {
+          res.eventChannel.emit('params', {
+            id: id,
+            formMode: Constants.formMode.edit
+          })
+        }
+      })
+    }
+    // 其他出库
+    else if (this.data.item.outType == Constants.outType.other) {
+      wx.navigateTo({
+        url: this.data.route.addOther.url,
+        events: {
+          // 回调后，在这里给页面赋值
+          bandData: function (e) { }
+        },
+        success: function (res) {
+          res.eventChannel.emit('params', {
+            id: id,
+            formMode: Constants.formMode.edit
+          })
+        }
+      })
+      // 销售退货
+    } else {
+      wx.navigateTo({
+        url: this.data.route.addReturn.url,
+        events: {
+          // 回调后，在这里给页面赋值
+          bandData: function (e) { }
+        },
+        success: function (res) {
+          res.eventChannel.emit('params', {
+            id: id,
+            formMode: Constants.formMode.edit
+          })
+        }
+      })
+    }
+
+  },
 })

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

@@ -17,7 +17,9 @@
       <view style="padding-left: 14rpx;padding-top: 19rpx;font-size: 26rpx;line-height: 36rpx;color: #FFFFFF;">
         {{item.outType == $t['saleOutType']?itemData.cusName:itemData.supplierName}}
       </view>
-
+      <view data-item="{{item}}" bind:tap="toEdit">
+        <van-image custom-class="image-class" src="/static/img/edit.png" />
+      </view>
     </view>
     <!-- 收货人 -->
     <view style="display: flex;padding-right: 32rpx;">
@@ -44,7 +46,7 @@
     <view style="display: flex;padding-left: 32rpx;padding-top: 16rpx;padding-bottom: 15rpx;padding-right: 32rpx;">
       <view style="display: flex; width: 50%;line-height: 36rpx;" data-type='deliveryType'>
         <view style="font-size: 24rpx;line-height: 36rpx;color: #FFFFFF;">
-           仓库配送>
+          仓库配送>
         </view>
       </view>
       <view style="display: flex; width: 50%;line-height: 36rpx;" data-key="DeliveryFlag" catchtap="openData">
@@ -56,13 +58,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" table="{{table}}"
-bind:editItems="setGoods" bind:delItem="setGoods" bind:setGoods="setGoods"
-cardContentList="{{cardContentList}}"
-quantityRedTitle="可售量："
-quantityRedCol="usableQty"
-quantityRedColFlagKey="usableQtyInsufficientFlag"
->
+<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="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

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

@@ -0,0 +1,7 @@
+/*图标显示*/
+.image-class {
+	width: 39rpx;
+	height: 39rpx;
+	left: 459rpx;
+	top: calc((100% - 28rpx)/2);
+  }

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

@@ -37,11 +37,11 @@ Page({
         pullType: 'mSelect',
         typeName: 'outType'
       },
-      {
-        code: 'outReason',
-        pullType: 'mSelect',
-        typeName: 'outReason'
-      },
+      // {
+      //   code: 'outReason',
+      //   pullType: 'mSelect',
+      //   typeName: 'outReason'
+      // },
       {
         code: 'cusName',
       },

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

@@ -106,7 +106,7 @@ Page({
      * @date : 2024/2/1 15:49
      * @author : 姜永辉
      */
-    setValuesByEdit(data) { 
+    setValuesByEdit(data) {
         let cardList_ = this.data.cardList
         let contentList_ = this.data.contentList
         let sumitemAmt = 0
@@ -155,7 +155,7 @@ Page({
         })
 
         // 刷新商品明细 显示 查看更多
-        let card = this.data.cardList.filter(it => it.name == 'items'); 
+        let card = this.data.cardList.filter(it => it.name == 'items');
         this.selectComponent('#' + this.data.formName).handleContentObj(card[0])
 
         this.setData({
@@ -176,7 +176,7 @@ Page({
     setGoods(e) {
         let contentList_ = this.data.contentList
         let cardList = this.data.cardList
-        let formData = JSON.parse(this.data.formData) 
+        let formData = JSON.parse(this.data.formData)
         let totalAmout = Number(0)
         // 各个明细的金额数量
         formData.goodsList.forEach(element => {  //循环出商品总共价格   
@@ -294,7 +294,7 @@ Page({
             params.intoQty = 0     //  已入库数量          
         }
         params.itemList = formData.goodsList //商品明细
-        params.annexPaths = formData.annexPaths|| [] //附件 
+        params.annexPaths = formData.annexPaths || [] //附件 
         return params
     },
     /**
@@ -302,7 +302,7 @@ Page({
      * @date : 2024/2/1 15:49
      * @author : 姜永辉
      */
-    saveData() { 
+    saveData() {
         if (this.data.itemData.intoStatus == Constants.intoStatus.inBounding) {
             if (this.data.item.intoType == Constants.intoType.pur) {
                 return this.excute(this.data.service, this.data.service.inBoundHandle, this.data.params)
@@ -531,10 +531,10 @@ Page({
     },
 
     /**
-  * @desc : （编辑）
-  * @date : 2024/2/1 15:49
-  * @author : 姜永辉
-  */
+     * @desc : （编辑）
+     * @date : 2024/2/1 15:49
+     * @author : 姜永辉
+     */
     toEdit(e) {
         let id = e.currentTarget.dataset.item.intoId
         // 采购入库

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

@@ -39,11 +39,11 @@ Page({
         pullType: 'mSelect',
         typeName: 'intoType'
       },
-      {
-        code: 'inReason',
-        pullType: 'mSelect',
-        typeName: 'intoReason'
-      },
+      // {
+      //   code: 'inReason',
+      //   pullType: 'mSelect',
+      //   typeName: 'intoReason'
+      // },
       {
         code: 'cusName',
       },