姜永辉 1 жил өмнө
parent
commit
c40c153a01

+ 1 - 0
api/pages/ivt/inboundOther.js

@@ -31,6 +31,7 @@ module.exports = {
       chooseWh: { key: 'chooseWh', url: '/package-base-select/pages/select-data/select-data',type:'warehouse'  },    
       chooseStorageObject: { key: 'chooseStorageObject',  url: '/package-base-select/pages/select-data/select-data',type:'objectType'   },
       chooseStorageInReason: { key: 'chooseStorageInReason', url: '/package-base-select/pages/select-data/select-data' ,type:'dictionary',dictCode:'基础资料-入库' },
+      openingInventory: { key: 'openingInventory', url: '/package-base-select/pages/select-data/select-data',type:'warehouse'  },
 
     }
   }

+ 2 - 1
package-base-select/pages/select-data/select-data.js

@@ -632,6 +632,7 @@ Page({
           dictCode: route.dictCode,
           chooseFlag: route.chooseFlag,
           repeatFlag: route.repeatFlag,
+          pageFlag:false,
           valueKey: 'dataId',
           title: 'dataValue',
           contentList: [{
@@ -672,7 +673,7 @@ Page({
       // 对象类型
       case Constants.chooseType.objectType:
         title = "对象类型"
-        this.setData({
+        this.setData({ 
           routeObjName: 'common',
           method: 'getSupplierAndCustomerData',
           title: 'objName',

+ 11 - 4
package-inventory/pages/other-warehousing/other-warehousing.js

@@ -56,8 +56,8 @@ Page({
                 code: 'whId',
                 name: 'whName',
                 title: mixins.$t('warehouseId'),
-                type: 'drop',
-                dropType: 'warehouse'
+                type: 'choose', 
+                urlKey: 'openingInventory' 
             },
             {
                 code: 'skuSpec',
@@ -176,9 +176,15 @@ Page({
                 title: mixins.$t('addOtherInWh'),
             })
             // 新增
-            if (this.data.formData == '{}') {
+            if (this.data.formData == '{}') { 
                 this.setData({
-                    formData: JSON.stringify({ intoDate: new Date().toDateStr() })
+                    formData: JSON.stringify({ 
+                        intoDate: new Date().toDateStr(),
+                        staffId: app.globalData.user.staffId,
+                        orgId: app.globalData.user.orgId,
+                        staffName: app.globalData.user.staffName,
+                        orgName: app.globalData.user.orgName,
+                    })
                 })
             }
         }
@@ -273,6 +279,7 @@ Page({
      * @date   : 2024年3月12日
      */
     chooseData(e) {
+        console.log("chooseData",e);
         let formData = JSON.parse(this.data.formData)
         let code = e.detail.code
         let data = e.detail.data.data

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

@@ -80,7 +80,7 @@ Page({
     contentList: [],
     // 列表的显示字段
     contentObj: {
-      '采购入库': [{
+      [ mixins.$t('purInBound')]: [{
         name: 'intoNo',
         title: mixins.$t('orderNo')
       }, {