采购

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

@@ -305,9 +305,7 @@ Page({
         //         card.max = 1
         //     }
         // })
-        // 刷新商品明细 显示 查看更多
-        let card = cardList_.filter(it => it.name == 'items');
-        this.selectComponent('#dk-form-bill').handleContentObj(card[0])
+ 
         this.setData({
             item: data,
             contentList: contentList_,
@@ -315,6 +313,9 @@ Page({
             popContent:popContent_,
             formData: JSON.stringify(data)
         })
+             // 刷新商品明细 显示 查看更多
+     let card = this.data.cardList.filter(it => it.name == 'items');
+     this.selectComponent('#'+this.data.formName).handleContentObj(card[0])
     },
 
 

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

@@ -6,7 +6,7 @@
 <!-- <dk-form id="{{formName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
 </dk-form> -->
 
-<dk-form-bill type="pur" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="pricePurchase" quantityCol="itemQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['wholesalePrice']}}：" bind:editItems="setGoods" bind:clear = "clear" table="{{table}}"
+<dk-form-bill id="{{formName}}"  type="pur"  routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="pricePurchase" quantityCol="itemQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['wholesalePrice']}}：" bind:editItems="setGoods" bind:clear = "clear" table="{{table}}"
 bind:delItem="setGoods" bind:setGoods="setGoods">
 </dk-form-bill>
 

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

@@ -106,15 +106,17 @@ Page({
         card.content = data.goodsList.sum("itemAmt")
       }
     })
-    // 刷新商品明细 显示 查看更多
-    let card = cardList_.filter(it => it.name == 'items');
-    this.selectComponent('#dk-form-bill').handleContentObj(card[0])
+        
+   
     this.setData({
       item: data,
       contentList: contentList_,
       cardList: cardList_,
       formData: JSON.stringify(data)
     })
+     // 刷新商品明细 显示 查看更多
+     let card = this.data.cardList.filter(it => it.name == 'items');
+     this.selectComponent('#'+this.data.formName).handleContentObj(card[0])
   },
   /**
    * @desc : 关闭

package-purchase/pages/purchase-order/purchase-order-detail/purchase-order-detail.wxml

@@ -92,7 +92,7 @@
 
 
  <!-- 商品信息 和 其他信息 -->
-<dk-form-bill id="dk-form-bill"  routeObjName="{{routeObjName}}" readonly ="{{true}}" 
+<dk-form-bill id="{{formName}}"  routeObjName="{{routeObjName}}" readonly ="{{true}}" 
 cardList="{{cardList}}"  titleTagCol ="shortName"  titleCol ="skuCode"   
 descCol = "skuModel" priceCol ="pricePur" quantityCol ="itemQty" sumAmountCol="itemAmt"  
 contentObj="{{contentObj}}" model:value="{{formData}}" popContent = "{{popContent}}" 

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

@@ -39,7 +39,8 @@ Page({
                 name: 'whName',
                 title: mixins.$t("warehouseId"), //'仓库',
                 type: 'drop',
-                dropType: 'warehouse'
+                dropType: 'warehouse',
+                required: true
             },
             {
                 code: 'skuSpec',
@@ -111,18 +112,7 @@ Page({
                 title: mixins.$t("sourceOrder"), //'关联源单',
                 urlKey: 'choosePurchaseOrder'
             }],
-            items: [{
-                code: 'collectType',
-                name: 'collectName',
-                type: 'drop',
-                required: true,
-                dropType: 'collect'
-            }, {
-                code: 'collectAmount',
-                type: 'number',
-                title: mixins.$t("amountCollected"), //'收款金额',
-                required: true
-            }],
+            items: [ ],
 
             other: [{
                 code: 'remarks',
@@ -166,8 +156,8 @@ Page({
             this.setData({
                 contentList: contentList_,
                 cardList,
-                chooseVisible:true,
-            }) 
+                chooseVisible: false,
+            })
         }
         this.setData({
             formData: JSON.stringify(formData)
@@ -198,10 +188,13 @@ Page({
         if (code == "whId") { //仓库
             formData.whId = data.id
             formData.whName = data.name
-            formData.goodsList.forEach(element => { //总单的入库仓库 作为一个总开关 直接改变 所以品的仓库
-                element.whId = data.id
-                element.whName = data.whName
-            });
+            if(formData.goodsList){
+                formData.goodsList.forEach(element => { //总单的入库仓库 作为一个总开关 直接改变 所以品的仓库
+                    element.whId = data.id
+                    element.whName = data.whName
+                });
+            }
+       
         }
         if (code == "sourceNo") { //来源单  
             this.calculateTotal(data.chooosepurchaseItemResponseList)
@@ -220,27 +213,59 @@ Page({
     setValuesByEdit(data) {
         { //是否可编辑逻辑
             if (data.fromId) { //有来源单据
-                this.setData({ //隐藏选商品
-                    chooseVisible:false
+                this.setData({ //隐藏选商品按钮
+                    chooseVisible: true
                 })
                 if (this.data.isSysSetting) { //系统参数为自动办理
                     if (this.data.nopay) { //未付款
-                        data.goodsList.forEach(element => { 
-                            //（添加商品、修改数量不能超出订单商品范围）
-                            element['itemQty_max'] = element.purItemQty -  element.purItemIntoingQty - element.purItemIntoQty + element.intoQty
+                        data.goodsList.forEach(element => {
+                            // （添加商品、修改数量不能超出订单商品范围）添加商品TODO(后期改为跳入来源单据让他选择原单数据回来)
+                            element['itemQty_max'] = element.purItemQty - element.purItemIntoingQty - element.purItemIntoQty + element.intoQty
                         });
-                    }else{ //已付款 (只可以编辑备注和附件)
-                      this.setData({
-                        readonly:true
-                      })
+                   
+                    } else { //已付款 (只可以编辑备注和附件)
+                        this.setData({
+                            readonly: true
+                        })
                     }
-                } else {
-
+                } else { //系统参数为手动办理
+                    if (data.intoStatus = Constants.intoStatus.inBounding) { //入库中 可以编辑修改商品、数量（修改商品、数量不能超出订单商品范围）和备注附件
+                        data.goodsList.forEach(element => {
+                            // （添加商品、修改数量不能超出订单商品范围）添加商品TODO(后期改为跳入来源单据让他选择原单数据回来)
+                            element['itemQty_max'] = element.purItemQty - element.purItemIntoingQty - element.purItemIntoQty + element.intoQty
+                        });
+                    } else { //已入库（未付款、已付款），只可以编辑备注、附件
+                        this.setData({
+                            readonly: true
+                        })
+                    } 
                 }
             } else { //无来源单据
-
+                if (this.data.isSysSetting) { //系统参数为自动办理  
+                    if (this.data.nopay) { //已入库（未付款），可以编辑修改数量（修改商品、数量不限制，数量改大时要校验库存量）和备注附件； 
+                    data.goodsList.forEach(element => {  //  设置库存量未最大值
+                        element['itemQty_max'] = element.invQty
+                    });
+                    } else { //已付款 (只可以编辑备注和附件)
+                        this.setData({
+                            readonly: true
+                        })
+                    }
+                } else { //系统参数为手动办理
+                    if (data.intoStatus = Constants.intoStatus.inBounded) { //已入库
+                        if(this.data.nopay){ //（未付款），可以编辑修改数量（修改商品、数量不限制，数量改大时要校验库存量）和备注附件 
+                          data.goodsList.forEach(element => {  //  设置库存量未最大值
+                            element['itemQty_max'] = element.invQty
+                        });
+                        }else{//已付款 (只可以编辑备注和附件)
+                            this.setData({
+                                readonly: true
+                            }) 
+                        } 
+                    } 
+                }
             }
-        }
+        } 
         let purIdArray_ = this.data.purIdArray //来源单id
         let cardList_ = this.data.cardList
         let contentList_ = this.data.contentList //底部按钮上的合计金额
@@ -254,6 +279,7 @@ Page({
 
         data.goodsList.forEach(element => {
             element.itemAmt = element.intoingAmt * element.intoingQty
+            element.itemQty = element.intoingQty
         });
         cardList_.forEach(card => { //循环出商品总共价格 展示用
             if (card.name === 'items') {
@@ -265,6 +291,10 @@ Page({
                 card.content = data.goodsList.sum("itemAmt")
             }
         })
+           // 刷新商品明细 显示 查看更多
+    let card = this.data.cardList.filter(it => it.name == 'items');
+    this.selectComponent('#'+this.data.formName).handleContentObj(card[0])
+
         this.setData({
             contentList: contentList_,
             purIdArray: purIdArray_,
@@ -273,7 +303,7 @@ Page({
         })
     },
     /**
-     * @desc :处理商品
+     * @desc :处理商品(选择采购订单处理)
      * @date : 2024/2/1 15:49
      * @author : 王英杰
      */
@@ -371,7 +401,7 @@ Page({
      * @date : 2024/2/1 15:49
      * @author : 王英杰
      */
-    validData() {
+    validData() { 
         let formData = JSON.parse(this.data.formData)
         let that = this
         if (formData.goodsList == null || formData.goodsList.length == 0) {
@@ -379,6 +409,7 @@ Page({
                 title: "请选择商品明细",
                 icon: 'none'
             })
+             
             return false
         }
         // 明细的数量和仓库不能为空
@@ -389,6 +420,7 @@ Page({
                     title: mixins.$t("chooseWh"),
                     icon: 'none'
                 })
+                 
                 return false
             }
             //如果 设置了总单的仓库 然后又进行选品 没设置一样的仓库 那就把总单上的仓库清空
@@ -406,9 +438,10 @@ Page({
                     title: mixins.$t("inputWords") + "[" + element.skuCode + "]" + mixins.$t("count"),
                     icon: 'none'
                 })
+                 
                 return false
             }
-        }
+        }  
         return true
     },
     /**
@@ -444,9 +477,9 @@ Page({
      */
     saveData() {
         if (this.data.formMode == Constants.formMode.edit) { //编辑保存
-            return this.excute(this.data.service, this.data.inboundProcessingService.inboundUpdate, this.data.params)
+            return this.excute(this.data.inboundProcessingService, this.data.inboundProcessingService.inboundUpdate, this.data.params)
         } else { //新建保存
-            return this.excute(this.data.service, this.data.inboundProcessingService.inboundInsert, this.data.params)
+            return this.excute(this.data.inboundProcessingService, this.data.inboundProcessingService.inboundInsert, this.data.params)
         }
 
     },
@@ -463,7 +496,17 @@ Page({
         let excute = this.excute(this.data.purchaseService, e.id, {});
         excute.then(res => {
             if (res.data.code === Constants.SUCESS_CODE) {
+                let formData = JSON.parse(this.data.formData)
+                formData = res.data.data
+                this.setData({
+                    formData:JSON.stringify(formData),
+                    chooseVisible: true
+                })
                 this.calculateTotal(res.data.data.purchaseItemResponseList)
+                   // 刷新商品明细 显示 查看更多
+                 let card = this.data.cardList.filter(it => it.name == 'items');
+             this.selectComponent('#'+this.data.formName).handleContentObj(card[0])
+
             }
         })
     },

package-purchase/pages/purchase-receipt/add/add.wxml

@@ -6,7 +6,7 @@
 <!-- <dk-form id="{{formName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
 </dk-form> -->
 
-<dk-form-bill type="pur" id="{{formName}}" routeObjName="{{routeObjName}}" 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" priceTitle="批发价：" bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{chooseVisible}}"
+<dk-form-bill type="pur" id="{{formName}}" routeObjName="{{routeObjName}}" 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" priceTitle="批发价：" bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}"
 bind:delItem="setGoods" bind:setGoods="setGoods">
 </dk-form-bill>