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

app.wxss

@@ -215,17 +215,17 @@ end
   background: #fff;
   width: 100%;
   border-radius: 15rpx 15rpx 0px  0px;
-  background: linear-gradient(180deg, #E2ECFF 0%, #FAFCFF 100%), #fff;
+  background: linear-gradient(95.33deg, #ADC6FF -2.27%, #F0F5FF 60.66%), linear-gradient(0deg, #F4F8FF, #F4F8FF), radial-gradient(58.28% 235.72% at 10.78% 50%, rgba(191, 213, 255, 0.6) 0%, rgba(216, 229, 255, 0) 56.69%);
   background-repeat: no-repeat;
-  background-size: 100% 46px;
+  background-size: 100% 80rpx;
 }
 .main-foot-1 {
   background: #fff;
   width: 100%;
   border-radius: 15rpx 15rpx 0px  0px;
-  background: linear-gradient(180deg, #6A9DFB 0%, #FAFCFF 100%),#fff;
+  background: linear-gradient(95.33deg, #ADC6FF -2.27%, #F0F5FF 60.66%), linear-gradient(0deg, #F4F8FF, #F4F8FF), radial-gradient(58.28% 235.72% at 10.78% 50%, rgba(191, 213, 255, 0.6) 0%, rgba(216, 229, 255, 0) 56.69%);
   background-repeat: no-repeat;
-  background-size: 100% 46px;
+  background-size: 100% 80rpx;
   
 
 }
@@ -235,8 +235,8 @@ end
   border-radius: 15rpx 15rpx 0px  0px;
   /* background: linear-gradient(180deg, #6A9DFB 0%, #FAFCFF 100%),#fff; */
   background-repeat: no-repeat;
-  background-size: 100% 46px; 
-  background: linear-gradient(91.65deg, #D9E6FF 3.83%, #F5F9FF 55.06%); 
+  background-size: 100% 80rpx; 
+  background: linear-gradient(95.33deg, #ADC6FF -2.27%, #F0F5FF 60.66%), linear-gradient(0deg, #F4F8FF, #F4F8FF), radial-gradient(58.28% 235.72% at 10.78% 50%, rgba(191, 213, 255, 0.6) 0%, rgba(216, 229, 255, 0) 56.69%);
 
 
 }
@@ -250,7 +250,6 @@ end
   display: flex;
   width: 100%;
   flex-direction: row;
-  margin-top: 6px;
 }
 
 .table-row-center {

components/dkbase/dk-form-bill/dk-form-bill.js

@@ -280,6 +280,10 @@ Component({
       type: Boolean,
       value:false
     },
+    sumAmountColTitle:{
+      type: String,
+      value:'合计金额'
+    },
     // 结果集
     value: {
       type: String,

components/dkbase/dk-form-bill/dk-form-bill.wxml

@@ -171,7 +171,7 @@
               <!--条数-->
               <dk-cell titleColor="#95A8CB;" contentColor="#95A8CB" title="{{$t['goodsQuantity'] }}" amount="{{false}}" content="{{(card[sumQuantityCol]?card[sumQuantityCol]:0)}}"></dk-cell>
               <!--合计金额-->
-              <dk-cell wx:if="{{card[sumAmountCol]}}" fontSize="16" fontWeight="bold" contentFontWeight="700" contentColor="#FF7B1A" titleColor="#1B365D;" title="合计金额" content="{{card[sumAmountCol]?card[sumAmountCol]:0}}"></dk-cell>
+              <dk-cell wx:if="{{card[sumAmountCol]}}" fontSize="16" fontWeight="bold" contentFontWeight="700" contentColor="#FF7B1A" titleColor="#1B365D;" title="{{sumAmountColTitle}}" content="{{card[sumAmountCol]?card[sumAmountCol]:0}}"></dk-cell>
               <!-- <view style="display: flex;width: calc(100% - 260rpx);">
               <view style="font-size: 16px;font-weight: bold;color:#1B365D;display: flex;align-items: center;">
                 合计金额

components/dkbusiness/dk-muti-dropdown-item/dk-muti-dropdown-item.wxss

@@ -8,13 +8,15 @@
 }
 
 .scroll_position {
+  margin-top: 20rpx;
   margin-left: 10rpx;
 }
 
 .choose_label {
   /* margin-bottom: 16px; */
   font-weight: bolder;
-  /* padding-top: 12px; */
+  /* padding-top: 20px; */
+  margin-top: 5rpx;
   background: #fff;
   padding: 0 0 0 40rpx;
   height: 40rpx;

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

@@ -17,7 +17,8 @@
 
 <van-dialog id="van-dialog" />
 <van-sticky offset-top="{{ 0 }}">
-  <van-nav-bar title="选择商品" left-text="" border="{{false}}" left-arrow="{{true}}" bind:click-left="onClickLeft" />
+  <!-- <van-nav-bar title="选择商品" left-text="" border="{{false}}" left-arrow="{{true}}" bind:click-left="onClickLeft" /> -->
+  <dk-navbar titleFontColor="#000000" navbarTitle="选择商品" bind:clickBack="onClickLeft" operateShow="{{false}}" bind:getNavbarHeight="getNavbarHeight"/>
 
   <view style="display: flex;">
     <view style="width: 85%;">

package-base-select/pages/select-source-sale-order/select-source-sale-order.js

@@ -52,6 +52,8 @@ Page({
     //销售状态
     params.outStatusList = [Constants.outStatus.unOutBound, Constants.outStatus.outBounding]
     params.cusId = this.data.item.id
+    params.flgSource = true
+    params.flgValidList = [true]
     return params
   },
 

package-base-select/pages/select-source-sale-order/select-source-sale-order.wxml

@@ -5,11 +5,9 @@
   <!-- 查询条件 -->
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['rpNo','skuName'])}}">
   </dk-dropdown-menu>
-
 </van-sticky>
 
 
-
 <view wx:for="{{tableData}}" data-item="{{item}}" wx:key="index" class="main-class-source">
   <view class="main-foot-source" style="border-radius: 15rpx;">
     <view class="table-content" data-item="{{item}}">

package-basic-data/pages/customer-list/detail/detail.js

@@ -383,7 +383,7 @@ Page({
     this.setData({
       loading: true
     })
-    this.excute(this.data.cusReceiptPaymentService, this.data.cusReceiptPaymentService.selectByCond, params).then(res => {
+    this.excute(this.data.cusReceiptPaymentService, this.data.cusReceiptPaymentService.selectByCond + '_cus', params).then(res => {
       if (res.data.code == 200) {
         this.setData({
           loading: false

package-business-analysis/pages/cus-rec-pay-report/cus-rec-pay-report.wxml

@@ -27,7 +27,7 @@
           <view class="top">
             <view class="title">{{itemInfo.biznisNo}}</view>
             <dk-cell left="0rpx" height="45rpx" contentRight="{{false}}" contentFontSize="14" contentColor="#A5814A"
-              contentFontWeight="bold" content="{{itemInfo.outAmt || itemInfo.returnAmt}}"></dk-cell>
+              contentFontWeight="bold" content="{{itemInfo.outAmt || itemInfo.returnAmt || itemInfo.sumAmtRec}}"></dk-cell>
           </view>
           <view class="under">
             <view class="type">{{itemInfo.type}}</view>

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

@@ -15,8 +15,8 @@
     <scroll-view scroll-y='{{true}}' bindscrolltolower='scrollToLower' lower-threshold='100'>
       <view wx:for="{{tableData}}" wx:key="index" data-item="{{item}}" class="main-class" style="width: 75%;margin-left: 166rpx;">
         <view class="main-foot" style="border-radius:15rpx;" data-item="{{item}}" catch:tap="toDetail">
-          <view>
-            <view class="table-content-row">
+          <view >
+            <view class="table-content-row" style="margin-bottom: 15rpx;">
               <view style="display:flex;width:100%;">
                 <view data-item="{{item}}" style="display:flex;font-size: 15px;">
                   <dk-text style="font-size:30rpx;" fontWeight="nomal" value="{{item.skuModel }}"></dk-text>

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

@@ -69,9 +69,18 @@ Page({
  */
   handleSearchData(tableData) {
     console.log('tableData',tableData);
+    const item = this.data.item
+    console.log('item', item);
     //处理图片
     if (tableData && tableData.length > 0) {
       tableData.forEach(element => {
+        // 计算包装
+        const qty = this.data.active == 0 ? element.intoQty:element.outQty
+        element['skuBox'] = parseInt(qty / item.packBox)
+        element['skuPiece'] = parseFloat(Number(qty % item.packBox)).toFixed(item.decimalPlaces) 
+        if(item.subUnitName){
+          element['skuBoxCurrent'] = element['skuBox'] + item.subUnitName + element['skuPiece'] + item.unitName
+        }
         element.imagesUrl = this.data.item.imagesUrl
       })
       this.setData({
@@ -109,12 +118,15 @@ Page({
     // 期末
     item['endingIvtBox'] = parseInt(item.endingIvtQty / item.packBox)
     item['endingIvtPiece'] = parseFloat(Number(item.endingIvtQty % item.packBox)).toFixed(item.decimalPlaces) 
+
+    // 包装
     if(item.subUnitName){
       item.packageBoxEndingIvt = item['endingIvtBox'] + item.subUnitName + item['endingIvtPiece'] + item.unitName
     }
     this.setData({
       item: item
     })
+    console.log(this.data.item);
   },
   /**
    * 跳转对应单据

package-inventory/pages/ivt-sum-report/detail/detail.wxml

@@ -147,16 +147,28 @@
         <view style="display: flex;padding-top: 10rpx;">
           <view style="font-size: 30rpx;width: 55%;color:#1B365D;">{{active==0?item_.intoNo:item_.outNo}}</view>
           <view style="width: 45%;font-size: 24rpx;color:#95A8CB;display: flex;justify-content: center;align-items: center;text-align: center;">
-            <view>{{active==0?item_.intoTypeName:item_.outTypeName}} {{active==0?item_.intoDate:item_.outDate }}</view>
+            <view style="color: #437FF8;font-weight: 600;">{{active==0?item_.intoTypeName:item_.outTypeName}} </view>  
+            <view style="margin-left: 10rpx;">{{active==0?item_.intoDate:item_.outDate }}</view>
           </view>
         </view>
       </view>
 
       <!-- 商品信息 -->
       <view style="background: #FFFFFF;">
-        <view style="display: flex;justify-content: space-between;align-items: center;">
-          <view style=" padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 30rpx;">{{$t['goodsQuantity']}}</view>
-          <view style=" padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 30rpx;">{{active==0?item_.intoQty:item_.outQty }}{{item_.unitName}}</view>
+        <view style="display: flex;justify-content: space-between;align-items: center;flex-direction: column;">
+            <view style="width: 100%;display: flex;justify-content: space-between;">
+              <view style=" padding: 10px 32rpx 10px 32rpx;color: #95A8CB;font-size: 30rpx;">数量</view>
+              <view style=" padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 30rpx;">{{active==0?item_.intoQty:item_.outQty }}{{item_.unitName}}</view>
+            </view>
+            <view wx:if="{{item_.skuBoxCurrent}}" style="width: 100%;display: flex;justify-content: space-between;">
+              <view style=" padding: 10px 32rpx 10px 32rpx;color: #95A8CB;font-size: 30rpx;">包装</view>
+              <view style=" padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 30rpx;">{{item_.skuBoxCurrent }}
+              </view>
+            </view>
+            <view style="width: 100%;display: flex;justify-content: space-between;">
+              <view style=" padding: 10px 32rpx 10px 32rpx;color: #95A8CB;font-size: 30rpx;">成本金额</view>
+              <dk-cell left="0rpx" style="margin-right: 28rpx;" center="center" fontSize="16" contentFontSize="17" contentColor="#FF7B1A" spaceWidth="0" contentFontWeight="700" amount="{{true}}" content="{{active==0?item_.intoAmt:item_.outAmt }}"></dk-cell>
+            </view>
         </view>
       </view>
     </view>

package-inventory/pages/ivt-warning-report/ivit-warning-report-setting/ivit-warning-report-setting.js

@@ -87,7 +87,7 @@ Page({
     excute.then(res => {
       if (res.data.code === Constants.SUCESS_CODE) { 
         let sidebarList = []
-      let   List =  [{ //增加全部标头
+        let List =  [{ //增加全部标头
           brandName: mixins.$t('all'),
           brandId: ''
         }] 

package-inventory/pages/ivt-warning-report/ivt-warning-report.wxml

@@ -22,7 +22,7 @@
       <view wx:for="{{tableData}}" wx:key="index" data-item="{{item}}" class="main-class" style="width: 75%;margin-left: 166rpx;">
         <view class="main-foot" style="border-radius:15rpx;" data-item="{{item}}">
           <view>
-            <view class="table-content-row">
+            <view class="table-content-row" style="margin-bottom: 15rpx;">
               <view style="display:flex;width:100%;">
                 <view data-item="{{item}}" style="display:flex;font-size: 15px;">
                   <dk-text style="font-size:30rpx;" fontWeight="nomal" value="{{item.skuModel }}"></dk-text>

package-sales/pages/sales-outbound/add/add.js

@@ -285,7 +285,7 @@ Page({
         fixed: true,
       },
       ]
-    }, 
+    },
     popContentReverse: [{
       code: 'sumAmount',
       type: 'number',
@@ -594,7 +594,7 @@ Page({
     params.addressName = params.address.addressName ? params.address.addressName : params.address.name
     // params.salesChannel = params.channelId
     params.canNegativeFlag = false
-    params.outDate = params.outDate ? params.outDate :  util.formatDayTime(new Date())
+    params.outDate = params.outDate ? params.outDate : util.formatDayTime(new Date())
 
     params.btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
     if (params.goodsList) { //算出 要收的钱
@@ -608,7 +608,7 @@ Page({
     params.objInfo['cusPhone'] = params.cusPhone
     params.objInfo['cusName'] = params.cusName
     params.objInfo['objectId'] = params.cusId
-    params.objectId= params.cusId
+    params.objectId = params.cusId
     params.objInfo['addressFull'] = params.addressFull
     params.formType = 11
     delete params['goodsList']
@@ -719,8 +719,8 @@ Page({
         formData = res.data.data.data
         //销售订单列表转出库
         formData.fromNo = formData.fromNo ? formData.fromNo : formData.orderNo
-        console.log('formData',formData)
-        formData.outDate =  util.formatDayTime(new Date(formData.outDate ? formData.outDate : formData.deliveryDate))
+        console.log('formData', formData)
+        formData.outDate = util.formatDayTime(new Date(formData.outDate ? formData.outDate : formData.deliveryDate))
         //处理地址
         formData.address = this.setAddress(formData)
         //处理明细
@@ -1130,30 +1130,39 @@ Page({
     }
     let formData = JSON.parse(this.data.formData)
     formData.goodsList.forEach(res => {
-      if (res.invId) {
+      if (res.invId ) {
         //选择的数量大于可售量
-        if (Math.abs(key ? res[key] : res.outQty) > res.usableQty) {
-          res['usableQtyInsufficientFlag'] = true //可售量不足
-          res['usableQty'] = res.usableQty //可售量
-          res['titpsItemColorFlagKey'] = true
-          res['titpsLabel'] = '缺货'
-        } else {
-          res['usableQtyInsufficientFlag'] = false //可售量不足
-          res['usableQty'] = res.usableQty //可售量
-          res['titpsItemColorFlagKey'] = false
-          res['titpsLabel'] = '有货'
+        //不包含外协
+        if(res.skuId){
+          if (Math.abs(key ? res[key] : res.outQty) > res.usableQty) {
+            res['usableQtyInsufficientFlag'] = true //可售量不足
+            res['usableQty'] = res.usableQty //可售量
+            res['titpsItemColorFlagKey'] = true
+            res['titpsLabel'] = '缺货'
+          } else {
+            res['usableQtyInsufficientFlag'] = false //可售量不足
+            res['usableQty'] = res.usableQty //可售量
+            res['titpsItemColorFlagKey'] = false
+            res['titpsLabel'] = '有货'
+          }
         }
+        
       } else {
+        //不包含外协
+        if(res.skuId){
         // res['usableQtyInsufficientFlag'] = true  //可售量不足
         // res['usableQty'] = res.usableQty  //可售量
         res['titpsItemColorFlagKey'] = true
         res['titpsLabel'] = '缺货'
+        }
+     
       }
 
     })
     let usableQtyInsufficientFlagList = formData.goodsList.filter(item => {
       return item.usableQtyInsufficientFlag
     })
+    console.log('calculationSalesUsableQty')
     this.setData({
       formData: JSON.stringify(formData),
       goodsTagColor: usableQtyInsufficientFlagList.length > 0 ? '#E4002B' : null //设置颜色
@@ -1298,6 +1307,9 @@ Page({
         formData.staffId = item.item.staffId
       }
     }
+    //处理库存量
+    this.setGoods()
+    this.calculationSalesUsableQty('outingQty')
     this.setData({
       formData: JSON.stringify(formData)
     })
@@ -1651,6 +1663,10 @@ Page({
         //   title: mixins.$t("actualTotalAmount")
         // }
       ]
+
+      // if(){
+
+      // }
       popContent = [{
         code: 'outingQty',
         type: 'step',
@@ -1678,12 +1694,20 @@ Page({
         required: true,
         readonly: true
       },
+      // {
+      //   code: 'whName',
+      //   title: mixins.$t("warehouseId"),
+      //   type: 'str',
+      //   readonly: true,
+      //   readonly: true
+      // },
       {
-        code: 'whName',
+        code: 'whId',
+        name: 'whName',
+        choosePopupType: 'inventorySku',
         title: mixins.$t("warehouseId"),
-        type: 'str',
-        readonly: true,
-        readonly: true
+        type: 'choose',
+        urlKey: 'openingInventory',
       },
       {
         code: 'nonStdCode',
@@ -1800,9 +1824,9 @@ Page({
       this.setFormMain()
       this.setFlagView(this)
       this.getItemDetal(this.data.id, 'saleOutBoundService', 'getOutboundForUpdate')
-      this.setData({
-        isDetailFlag: true,
-      })
+      // this.setData({
+      //   isDetailFlag: true,
+      // })
       this.setData({
         formData: JSON.stringify(formData),
       })
@@ -1826,6 +1850,48 @@ Page({
       })
     }
   },
+
+  /**
+   * @desc : 打开商品事件
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  openChoosedItemInfo(e) {
+    if (e.detail.item.skuId || e.detail.item.skuId != null) {
+      //外协品 不显示仓库
+      //详情(办理)
+      if (this.data.formMode == Constants.formMode.detail) {
+        this.setData({
+          popContent:[{
+            code: 'outingQty',
+            type: 'step',
+            title: mixins.$t("count"),
+            required: true,
+          },
+          {
+            code: 'packageBox',
+            type: 'packageBox',
+            title: mixins.$t("packageBox"),
+          },
+          {
+            code: 'factPrice',
+            type: 'number',
+            title: mixins.$t("factPrice"),
+            required: true,
+            readonly: true
+          },
+          {
+            code: 'nonStdCode',
+            title: mixins.$t("goodsBatch"),
+            type: 'str',
+            readonly: true
+          },
+          ]
+        })
+      }
+    }
+  },
+
   /**
    * @desc : 设置系统版本相关
    * @date : 2024/2/1 15:49
@@ -2086,4 +2152,18 @@ Page({
       }
     })
   },
+
+
+  /**
+ * @desc : onShow
+ * @date : 2024/2/1 15:49
+ * @author : 于继渤
+ */
+  onShow() {
+    //详情页
+    if (this.data.formMode == Constants.formMode.detail) {
+      console.log('保存成功后刷新页面')
+      this.getItemDetal(this.data.id, 'saleOutBoundService', 'getOutboundForUpdate')
+    }
+  }
 })

package-sales/pages/sales-outbound/add/add.wxml

@@ -4,14 +4,14 @@
 
 
  
-<dk-form-bill type="saleOut" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula" descCol="skuName"     priceCol="factPrice" quantityCol="outingQty" sumAmountCol="sumAmount" iconCol="imagesUrl" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}" pupPriceCol="factAmt"  bind:editItems="editItems" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList" bind:customersChoose="customersChoose" popType="sale"   staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel" readonly="{{isDetailFlag}}" isDetailFlag="{{isDetailFlag}}"dataTime="{{dataTime}}"minDate="{{dataTime}}"titleTagCol="brandName" bind:openReverseCalculationPop="openReverseCalculationPop1"reverseCalculationFlag="true"wholeOrderDiscountCol="discount"discountAmountCol="discAmt">
+<dk-form-bill type="saleOut" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula" descCol="skuName"     priceCol="factPrice" quantityCol="outingQty" sumAmountCol="sumAmount" iconCol="imagesUrl" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}" pupPriceCol="factAmt"  bind:editItems="editItems" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList" bind:customersChoose="customersChoose" popType="sale"   staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel" readonly="{{isDetailFlag}}" isDetailFlag="{{isDetailFlag}}"dataTime="{{dataTime}}"minDate="{{dataTime}}"titleTagCol="brandName" bind:openReverseCalculationPop="openReverseCalculationPop1" reverseCalculationFlag="{{false}}"wholeOrderDiscountCol="discount"discountAmountCol="discAmt" sumAmountColTitle="折后金额">
  
 </dk-form-bill>
 <van-dialog id="van-dialog" />
 <view style="height: 200rpx;"></view>
 
 <!-- 底部加号" -->
-<view wx:if="{{(!unOrderFlgValid)&&formMode =='detail'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+<view wx:if="{{(!unOrderFlgValid)&&formMode =='detail'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 2;" bindtap="toEdit">
   <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 

package-sales/pages/sales-outbound/sales-outbound.js

@@ -90,11 +90,11 @@ Page({
       pullType: 'mSelect',
       typeName: 'outStatus'
     },
-    {
-      code: 'receiveStatus',
-      pullType: 'mSelect',
-      typeName: 'receiveStatus'
-    },
+    // {
+    //   code: 'receiveStatus',
+    //   pullType: 'mSelect',
+    //   typeName: 'receiveStatus'
+    // },
     {
       code: 'delivery_Time',
       dataType: 'date'

pages/home-page/home-page.js

@@ -373,7 +373,7 @@ Page({
       wx.navigateTo({
         url: item.objectPath ? item.objectPath : item.url,
         success: function (res) {
-          res.eventChannel.emit('params', { formMode: 'index', menuUuid: menuUuid, guideUrl: guideUrl })
+          res.eventChannel.emit('params', { formMode: 'index', menuUuid: menuUuid, guideUrl: guideUrl, objectCode: item.objectCode })
         }
       })
     }