期初入库

components/dkbusiness/dk-label-multiple-select/dk-label-multiple-select.js

@@ -153,7 +153,11 @@ Component({
           id: '入库类型-其他入库',
           infotype: 'default'
         },
-   
+        {
+          name: '期初入库',
+          id: '入库类型-期初入库',
+          infotype: 'default'
+        },
         ];
         this.setData({
           moreList: stowList,

i18n/zh-CN.js

@@ -113,6 +113,7 @@ const ivt = {
   outReason: '出库原因',
   outProcessing: '出库办理',
   otherInWh: '其他入库',
+  firstInWh: '期初入库',
   otherOutWh: '其他出库',
   purInBound: '采购入库',
   saleOutBound: '销售出库',

package-base-select/pages/select-data/select-data.js

@@ -404,6 +404,8 @@ Page({
    */
   editItems(e) {
     let data = e.detail.form
+    // 基础资料的传值 
+    data.dictCode = this.data.dictCode
     this.setData({
       formData: JSON.stringify(data)
     })
@@ -777,10 +779,12 @@ Page({
       // 数据字典
       case Constants.chooseType.dictionary:
         title = "数据字典"
+        let dictCode = route.dictCode
         this.setData({
           addUrl: '/package-basic-data/pages/basic-data/basic-data',
           routeObjName: 'common',
           method: 'getDictionaryData',
+          routeObjNamePop: 'basicData',
           dictCode: route.dictCode,
           chooseFlag: route.chooseFlag,
           repeatFlag: route.repeatFlag,
@@ -796,8 +800,19 @@ Page({
             title: '字典项目'
           },
           ],
-          placeholder: ['orgName']
+          placeholder: ['orgName'],
+          
         })
+        if (dictCode == mixins.$t('reasonStorageSys')){
+          let popContent =
+          [           
+            { code: 'dataValue', type: 'str', title: mixins.$t('reasonName'), required: true },
+            { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false,   },
+          ]
+          this.setData({
+            popContent
+          })
+        }
         break;
       // 系统数据
       case Constants.chooseType.kindData:

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

@@ -351,7 +351,8 @@ Page({
   loadInit() {
     if (this.data.item.outStatus == Constants.outStatus.outBounded) {
       this.setData({
-        flgEdit: true
+        flgEdit: true,
+        validFlag: false,
       })
     }
     let contentObj = {}

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

@@ -345,9 +345,15 @@ Page({
     loadInit() {
         if (this.data.item.intoStatus == Constants.intoStatus.inBounded) {
             this.setData({
-                flgEdit: true
+                validFlag: false
             })
+            if (this.data.item.intoType != Constants.intoType.first) {
+                this.setData({
+                    flgEdit: true
+                })
+            }
         }
+
         let contentObj = {}
         let cardList = []
         // 采购入库
@@ -414,11 +420,20 @@ Page({
                 cardList,
             })
 
-        } else if (this.data.item.intoType == Constants.intoType.other) {
-            // 其他入库
-            wx.setNavigationBarTitle({
-                title: mixins.$t('otherInWh'),
-            })
+        } else if (this.data.item.intoType == Constants.intoType.other ||
+            this.data.item.intoType == Constants.intoType.first) {
+            if (this.data.item.intoType == Constants.intoType.first) {
+                // 其他入库
+                wx.setNavigationBarTitle({
+                    title: mixins.$t('firstInWh'),
+                })
+            } else {
+                // 其他入库
+                wx.setNavigationBarTitle({
+                    title: mixins.$t('otherInWh'),
+                })
+            }
+
             cardList = [{
                 name: 'main',
                 title: mixins.$t('inBoundInfo'),
@@ -616,7 +631,7 @@ Page({
                 success: function (res) {
                     res.eventChannel.emit('params', {
                         id: id,
-                        formType:Constants.formMode.detail,
+                        formType: Constants.formMode.detail,
                         formMode: Constants.formMode.detail,
                     })
                 }

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

@@ -140,7 +140,25 @@ Page({
         name: 'intoDate',
         title: mixins.$t('intoDate')
       }],
-
+      '期初入库': [{
+        name: 'intoNo',
+        title: mixins.$t('inOrderNo')
+      }, {
+        name: 'intoReasonName',
+        title: mixins.$t('intoReason')
+      }, {
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: mixins.$t('staffId')
+        }],
+        title: mixins.$t('cpManager')
+      }, {
+        name: 'intoDate',
+        title: mixins.$t('intoDate')
+      }],
     },
     // 弹出按钮
     buttonList: [
@@ -217,8 +235,7 @@ Page({
       url: this.data.route.addOther.url,
       events: {
         // 回调后，在这里给页面赋值
-        refresh: function (e) {
-          console.log("addOther----");
+        refresh: function (e) { 
           that.searchData()
          }
       },
@@ -244,7 +261,9 @@ Page({
         e.detail.item.button = button
       }
       // 如果name不传递，默认为edit
-      if (item.intoType == Constants.intoType.pur || item.intoType == Constants.intoType.other) {
+      if (item.intoType == Constants.intoType.pur 
+        || item.intoType == Constants.intoType.other
+        || item.intoType == Constants.intoType.first) {
         e.detail.name = 'edit'
       } else {
         e.detail.name = 'editReturn'
@@ -351,10 +370,9 @@ Page({
   * @date : 2024年3月8日
   * @author : 姜永辉
   */
-  toPoint(e) {
-    console.log("toPoint", e);
+  toPoint(e) { 
     let item = e.detail.item
-    if (item.flgValid) {
+    if (item.flgValid && item.intoType != Constants.intoType.first) {
       // 待入库
       if (this.data.active == 0  && !this.data.flgHandleSetting) {
         this.setData({

utils/Constants.js

@@ -215,6 +215,7 @@ module.exports = {
     pur: '入库类型-采购入库',
     saleReturn: '入库类型-采退出库',
     other: '入库类型-其他入库',
+    first: '入库类型-期初入库',
   },
 
   // 入库状态