函数名称修正

api/pages/common/common.js

@@ -16,12 +16,11 @@ module.exports = {
         getInitData: 'get_init_data',
         getUser: 'get_user',
         getUserByPage: 'get_user_by_page',
-        selectById: '',
-        goodsBrandListBy: 'goods_brand_list_by', //商品品牌
-        goodsSeriesListBy: 'goods_Series_list_by', //商品系列
-        goodsCategoryListBy: 'goods_category_list_by', //商品种类
-        unitListBy: 'unit_list_by', //计量单位
-        warehouseListBy: 'get_warehouse_by_page', //仓库档案（带分页）
+        selectById: '', 
+        getGoodsSeriesListBy: 'get_goods_Series_list_by', //商品系列
+    
+        getUnitListBy: 'get_unit_list_by', //计量单位
+        getWarehouseListBy: 'get_warehouse_by_page', //仓库档案（带分页）
         getWarehouse :'get_warehouse',//仓库档案（不带分页）
         getDictionaryData: 'get_dictionary_data', //数据字典
         getDataKind: 'get_data_kind', //系统数据

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

@@ -674,7 +674,7 @@ Page({
         this.setData({
           routeObjName: 'common',
           routeObjNamePop: 'warehouse',
-          method: 'warehouseListBy',
+          method: 'getWarehouseListBy',
           title: 'whName',
           contentList: [{
             name: 'supervisor',

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

@@ -633,8 +633,7 @@ Page({
    * @author : 于继渤
    */
   getGoodsCategoryNoPage() {
-    return this.excute(this.data.commonService, this.data.commonService.getGoodsCategoryNoPage, {}).then(res => {
-      console.log('goodsCategoryListBy', res.data.data)
+    return this.excute(this.data.commonService, this.data.commonService.getGoodsCategoryNoPage, {}).then(res => { 
       this.setData({
         typeList: this.data.typeList.concat(res.data.data)
       })

package-basic-data/pages/product-file/metering-unit/metering-unit.js

@@ -79,7 +79,7 @@ Page({
   * @author : 王英杰
   */
  getData(params) {
-  return this.excute(this.data.commonService, this.data.commonService.unitListBy, params);
+  return this.excute(this.data.commonService, this.data.commonService.getUnitListBy, params);
 },
  /**
    * @desc   : 新建编辑事件

package-basic-data/pages/product-file/product-series/product-series.js

@@ -90,7 +90,7 @@ Page({
   * @author : 王英杰
   */
  getData(params) {
-  return this.excute(this.data.commonService, this.data.commonService.goodsSeriesListBy, params);
+  return this.excute(this.data.commonService, this.data.commonService.getGoodsSeriesListBy, params);
 },
  /**
    * @desc   : 新建编辑事件

package-inventory/pages/ivt-detail-report/ivt-detail-report.js

@@ -175,7 +175,7 @@ Page({
       })
       // 库区
       list.push({
-        title:  mixins.$t('reservoirArea'),
+        title: mixins.$t('reservoirArea'),
         value: item.whName ? item.whName : '',
         copyValue: item.whName ? item.whName : '',
       })
@@ -193,8 +193,8 @@ Page({
       })
       // 库存量
       list.push({
-        title: mixins.$t('storageNum'), 
-        value: (item.invQty ? item.invQty : '0') +  item.unitName,
+        title: mixins.$t('storageNum'),
+        value: (item.invQty ? item.invQty : '0') + item.unitName,
         copyValue: item.invQty ? item.invQty : '0',
       })
       // 可售包装 
@@ -207,7 +207,7 @@ Page({
           value: item.packageBox,
           copyValue: item.packageBox,
         })
-      } 
+      }
       item.list = list
       if (item.skuImages && item.skuImages.length > 0) {
         item.skuImages.forEach(it => {
@@ -227,7 +227,6 @@ Page({
   */
   getGoodsBrandNoPage() {
     return this.excute(this.data.commonService, this.data.commonService.getGoodsBrandNoPage, {}).then(res => {
-      console.log('getGoodsBrandNoPage', res.data.data)
       this.setData({
         typeList: this.data.typeList.concat(res.data.data)
       })

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

@@ -436,6 +436,7 @@ Page({
 
         let contentObj = {}
         let cardList = []
+
         // 采购入库
         if (this.data.item.intoType == Constants.intoType.pur) {
             wx.setNavigationBarTitle({
@@ -599,7 +600,13 @@ Page({
             wx.setNavigationBarTitle({
                 title: mixins.$t('firstInWh'),
             })
-
+            // 期初入库 --不能编辑箱片
+            let popContent = this.data.popContent
+            popContent.forEach(p => {
+                if (p.code === 'packageBox') {
+                    p.readonly = true
+                }
+            })
             cardList = [
                 {
                     name: 'items',
@@ -614,8 +621,6 @@ Page({
                 }
             ]
             contentObj = {
-
-
                 items: [{
                     code: 'collectType',
                     name: 'collectName',
@@ -641,6 +646,7 @@ Page({
             this.setData({
                 contentObj,
                 cardList,
+                popContent,
             })
         } else {
             // 销售退货

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

@@ -33,7 +33,7 @@ Page({
     }],
 
     // 查询条件-筛选
-    pullMenuList: [
+    pullMenuList: (app.globalData.company.gradeCode == Constants.gradeCode.PRO)?[
       {
         code: 'intoType',
         pullType: 'mSelect',
@@ -52,6 +52,40 @@ Page({
         code: 'supName',
       },
       {
+        code: 'whName',
+        title: mixins.$t('reservoirArea')
+      },
+      {
+        code: 'staffName',
+      },
+      {
+        code: 'orgName',
+      },
+      {
+        code: 'flgValid',
+        title: mixins.$t('flgValid'),
+        dataType: 'checkbox'
+      },
+    ]:[
+      {
+        code: 'intoType',
+        pullType: 'mSelect',
+        typeName: 'intoTypeSt'
+      },
+      {
+        code: 'cusName',
+      },
+      {
+        code: 'cusPhone',
+      },
+      {
+        code: 'addressFull',
+      },
+      {
+        code: 'whName',
+        title: mixins.$t('reservoirArea')
+      },
+      {
         code: 'staffName',
       },
       {
@@ -583,75 +617,74 @@ Page({
    * @author : 姜永辉
    */
   loadInit() {
-    console.log(app.globalData.company.gradeCode);
+    let pullMenuList = []
     if (app.globalData.company.gradeCode == Constants.gradeCode.PRO) {
       //专业
-      this.setData({
-        pullMenuList: [
-          {
-            code: 'intoType',
-            pullType: 'mSelect',
-            typeName: 'intoType'
-          },
-          {
-            code: 'cusName',
-          },
-          {
-            code: 'cusPhone',
-          },
-          {
-            code: 'addressFull',
-          },
-          {
-            code: 'supName',
-          },
-          {
-            code: 'staffName',
-          },
-          {
-            code: 'orgName',
-          },
-          {
-            code: 'flgValid',
-            title: mixins.$t('flgValid'),
-            dataType: 'checkbox'
-          },
-        ],
-      })
-    } else { 
-      this.setData({
-        pullMenuList: [
-          {
-            code: 'intoType',
-            pullType: 'mSelect',
-            typeName: 'intoTypeSt'
-          },
-          {
-            code: 'cusName',
-          },
-          {
-            code: 'cusPhone',
-          },
-          {
-            code: 'addressFull',
-          },
-          {
-            code: 'supName',
-          },
-          {
-            code: 'staffName',
-          },
-          {
-            code: 'orgName',
-          },
-          {
-            code: 'flgValid',
-            title: mixins.$t('flgValid'),
-            dataType: 'checkbox'
-          },
-        ],
-      })
+      pullMenuList = [
+        {
+          code: 'intoType',
+          pullType: 'mSelect',
+          typeName: 'intoType'
+        },
+        {
+          code: 'cusName',
+        },
+        {
+          code: 'cusPhone',
+        },
+        {
+          code: 'addressFull',
+        },
+        {
+          code: 'supName',
+        },
+        {
+          code: 'staffName',
+        },
+        {
+          code: 'orgName',
+        },
+        {
+          code: 'flgValid',
+          title: mixins.$t('flgValid'),
+          dataType: 'checkbox'
+        },
+      ]
+    } else {
+      pullMenuList = [
+        {
+          code: 'intoType',
+          pullType: 'mSelect',
+          typeName: 'intoTypeSt'
+        },
+        {
+          code: 'cusName',
+        },
+        {
+          code: 'cusPhone',
+        },
+        {
+          code: 'addressFull',
+        },
+        {
+          code: 'supName',
+        },
+        {
+          code: 'staffName',
+        },
+        {
+          code: 'orgName',
+        },
+        {
+          code: 'flgValid',
+          title: mixins.$t('flgValid'),
+          dataType: 'checkbox'
+        },
+      ]
     }
+    this.setData({
+      pullMenuList,
+    })
   },
 
 })

pages/shopping/shopping.js

@@ -309,8 +309,7 @@ Page({
    * @author : 于继渤
    */
   getGoodsCategoryNoPage() {
-    return this.excute(this.data.commonService, this.data.commonService.getGoodsCategoryNoPage, {}).then(res => {
-      console.log('goodsCategoryListBy', res.data.data)
+    return this.excute(this.data.commonService, this.data.commonService.getGoodsCategoryNoPage, {}).then(res => { 
       this.setData({
         typeList: this.data.typeList.concat(res.data.data)
       })