Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

package-inventory/pages/inventory-check/add/add.js

@@ -221,6 +221,7 @@ Page({
         formData.goodsList.forEach((element, index) => {
             let item = {}
             item.itemIndex = index
+            item.intoAmt = 0
             item.skuId = element.skuId
             item.invId = element.invId
             item.whId = element.whId
@@ -308,15 +309,30 @@ Page({
         let card = this.data.cardList.filter(it => it.name == 'items');
         this.selectComponent('#' + this.data.formName).handleContentObj(card[0])
     },
-    /**
-     * @desc : 初始化数据
-     * @date : 2024/2/1 15:49
-     * @author : 王英杰
-     */
-    loadInit() {
-          
-
-    },
+      /**
+   * @desc : 初始化数据
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  loadInit() {
+    
+ 
+ 
+    if (this.data.formMode != Constants.formMode.edit) { //新建
+    
+      let formData = JSON.parse(this.data.formData)
+    //采购人员和采购部门默认带出来（当前登录人
+    formData.staffId = app.globalData.user.staffId
+    formData.orgId = app.globalData.user.orgId
+    formData.staffName = app.globalData.user.staffName
+    formData.orgName = app.globalData.user.orgName
+    formData.whId = app.globalData.user.defaultWhId
+    formData.whName = app.globalData.user.defaultWhName 
+      this.setData({
+        formData: JSON.stringify(formData), 
+      })
+    }
+  },
     /**
      * @desc : 按钮点击事件回调
      * @date : 2024/2/1 15:49
@@ -333,6 +349,7 @@ Page({
             this.setData({
                 validFlag: false
             })
+            return
         }
         this.setData({
             draftFlag: draftFlag

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

@@ -629,17 +629,7 @@ Page({
    * @author : 王英杰
    */
   loadInit() {
-    let formData = JSON.parse(this.data.formData)
-    //采购人员和采购部门默认带出来（当前登录人
-    formData.staffId = app.globalData.user.staffId
-    formData.orgId = app.globalData.user.orgId
-    formData.staffName = app.globalData.user.staffName
-    formData.orgName = app.globalData.user.orgName
-    formData.whId = app.globalData.user.defaultWhId
-    formData.whName = app.globalData.user.defaultWhName
-    this.setData({
-      formData: JSON.stringify(formData)
-    })
+    
     let flgHandleSetting = this.data.flgHandleSetting //true为自动办理  false 为手动办理
     let contentList = this.data.contentList
     if (flgHandleSetting) { //系统参数中的自动办理参数  隐藏左下角cheakbox
@@ -679,7 +669,16 @@ Page({
           card.info = ""
         }
       })
+      let formData = JSON.parse(this.data.formData)
+    //采购人员和采购部门默认带出来（当前登录人
+    formData.staffId = app.globalData.user.staffId
+    formData.orgId = app.globalData.user.orgId
+    formData.staffName = app.globalData.user.staffName
+    formData.orgName = app.globalData.user.orgName
+    formData.whId = app.globalData.user.defaultWhId
+    formData.whName = app.globalData.user.defaultWhName 
       this.setData({
+        formData: JSON.stringify(formData),
         cardList_
       })
     }