订阅消息等

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

@@ -620,7 +620,7 @@ Component({
         popupTopObj_sku = this.data.popupTopObj
         popContent_sku = popContent_
       } else { //外协品走
-        //  全-免费版-销售出库-新建、编辑、详情-外协品-抽屉不展示库存量、仓库字段 商品品牌 色号 
+        //  全-标准版-销售出库-新建、编辑、详情-外协品-抽屉不展示库存量、仓库字段 商品品牌 色号 
         popContent_sku = popContent_
         let whId_index = popContent_.findIndex(element => element.code == 'whId');
         if (whId_index !== -1) {

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

@@ -233,6 +233,7 @@ Component({
   data: {
     ids: [],
     DataSourceCode: '',
+    flgBusiness: '',
     // 是否点击清除按钮
     isClickClear: false,
     datalists: {},
@@ -339,9 +340,12 @@ Component({
       let typeName = this.data.typeName
       let docName = this.data.docName
       let name = ''
+      let flgBusiness = ''
       // 部门
       if (typeName === 'org') {
         DataSourceCode = 'org'
+        console.log(666);
+        flgBusiness = true
         name = '业务部门'
       }
       //业务员
@@ -391,7 +395,8 @@ Component({
         name = '结算方式'
       }
       this.setData({
-        DataSourceCode: DataSourceCode
+        DataSourceCode: DataSourceCode,
+        flgBusiness: flgBusiness
       })
     },
     setCheck() {
@@ -417,6 +422,9 @@ Component({
       }
       if (DataSourceCode === 'org' || DataSourceCode === 'staff') {
         param.docName = this.data.docName
+        if(DataSourceCode === 'org'){
+          param.flgBusiness = this.data.flgBusiness
+        }
       }
 
       if (DataSourceCode === 'staff' && this.data.jobIds && this.data.jobIds.length > 0) {

components/dkbusiness/dk-single-dropdown-item/dk-single-dropdown-item.js

@@ -326,6 +326,7 @@ Component({
    */
   data: {
     DataSourceCode: '',
+    flgBusiness: '',
     // 是否点击清除按钮
     isClickClear: false,
     // datalist: [],
@@ -382,6 +383,7 @@ Component({
 
       if (typeName === 'org') {
         DataSourceCode = 'org'
+        flgBusiness = true
         name = '业务部门'
       }
       //业务员
@@ -423,7 +425,8 @@ Component({
         name = '初始款项'
       }
       this.setData({
-        DataSourceCode: DataSourceCode
+        DataSourceCode: DataSourceCode,
+        flgBusiness: flgBusiness
       })
     },
     /**

i18n/zh-CN.js

@@ -222,7 +222,7 @@ const home = {
   registerCommany: '注册商户',
   updateCommanyOwner: '责任人转让',
   settingCommany: '商户设置',
-  standardVersion: '免费版',
+  standardVersion: '标准版',
   flagshipVersion: '旗舰版',
   professionalVersion: '专业版',
   gradeCode: '开通产品',
@@ -560,7 +560,7 @@ const org = {
   newSubOrg: '新建子部门',
   newStaff: '新建员工',
   org: '部门详情',
-  std:'免费版',
+  std:'标准版',
   pro:'专业版',
 }
 // 供应商

package-accounts-manage/pages/daily-reconciliation-statement/daily-reconciliation-statement.wxml

@@ -49,7 +49,7 @@
               {{item_.accDate }}
             </view>
             <view class="title">
-              <view style="font-size: 13px;font-weight: 500;color:#95A8CB">余额</view>
+              <view style="font-size: 13px;font-weight: 500;color:#95A8CB">账户余额</view>
               <dk-cell left="20rpx" height="45rpx" contentRight="{{false}}" contentFontSize="13" contentColor="#95A8CB" contentFontWeight="bold" content="{{item_.balance ? item_.balance : 0}}"></dk-cell>
             </view>
           </view>

package-basic-data/pages/customer-reception/add/add.js

@@ -62,7 +62,38 @@ Page({
     } else {
       return this.excute(this.data.service, this.data.service.insert, this.data.params);
     }
-
+  },
+  /**
+   * @desc : 消息订阅方法
+   * @author : 刘尧
+   * @date : 2024/7/19
+   */
+  subscribeMessage(e) {
+    const that = this
+    const tmplIds = ['z3REuwft6NLPxVW8s5HN1UgWjFstWjD0QfCXNLTa0LA']
+    wx.getSetting({
+      withSubscriptions: true,
+      success (res){
+        if(res.subscriptionsSetting && res.subscriptionsSetting.mainSwitch){
+          if(res.subscriptionsSetting['z3REuwft6NLPxVW8s5HN1UgWjFstWjD0QfCXNLTa0LA'] && res.subscriptionsSetting['z3REuwft6NLPxVW8s5HN1UgWjFstWjD0QfCXNLTa0LA'] !== "accept"){
+            wx.requestSubscribeMessage({
+              tmplIds: tmplIds,
+              success (res) {
+                that.save(e)
+              },
+              fail(res) {
+                that.save(e)
+              }
+            })
+          }else {
+            that.save(e)
+          }
+        }
+      },
+      fail(res){
+        that.save(e)
+      }
+    })
   },
    /**
    * @desc : 编辑

package-basic-data/pages/customer-reception/add/add.wxml

@@ -47,4 +47,4 @@
 </view>
 
 <!--  保存 -->
-<dk-save-button model:value="{{btnFormData}}" wx:if="{{formType !=='detail'}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="save"></dk-save-button>
+<dk-save-button model:value="{{btnFormData}}" wx:if="{{formType !=='detail'}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="subscribeMessage"></dk-save-button>

package-purchase/pages/supplier-list/supplier-list.js

@@ -116,7 +116,10 @@ Page({
           footerAmount: footerAmount,
           footerInfo: footerInfo
         })
-    }     
+    }else {
+      console.log('app.globalData', app.globalData);
+    }
+         
   },
   /**
    * @desc : 左滑 停用回调

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

@@ -980,7 +980,7 @@ Page({
     //   if (!res) {
     //     return;
     //   }
-    //  全-免费版-销售出库-编辑-【自动出库办理】就算没勾选也不要这个提示，直接过
+    //  全-标准版-销售出库-编辑-【自动出库办理】就算没勾选也不要这个提示，直接过
     if (name == 'save' || name == 'detail') { //保存
       this.save({})
     } else if (name == 'collection') {

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

@@ -250,7 +250,7 @@ Page({
         },
         ]
       }
-      //6460 标-免费版-销售出库-一览-三个点再加一个客户收款  除了标准版 其他的删除客户收款
+      //6460 标-标准版-销售出库-一览-三个点再加一个客户收款  除了标准版 其他的删除客户收款
       if (this.data.gradeCode !== Constants.gradeCode.STD) {
         if (buttonList.length > 0) {
           for (let i = 0; i < buttonList.length; i++) {

pages/home-page/home-page.js

@@ -130,6 +130,7 @@ Page({
       })
     }
   },
+
   /**
   * @desc : 查询应收和收款
   * @author : 周兴

pages/home-page/home-page.wxml

@@ -63,6 +63,11 @@
     </view>
   </view>
 
+
+  <!-- <view>
+    <button bind:tap="subscribeMessage">消息订阅测试</button>
+  </view> -->
+
   <!--广告-->
   <view wx:if="{{advertisementList && advertisementList.length > 0}}">
     <swiper indicator-dots="{{true}}" autoplay="true" interval="10000" style="height: 200rpx;">

pages/shopping/shopping.js

@@ -594,7 +594,7 @@ Page({
     //跳转销售订单
     let that = this
     let url = that.data.route.saleOrder.url
-    // // 购物车-结算跳转页面；免费版跳转销售出库新建；专业版:：跳转销售订单新建  
+    // // 购物车-结算跳转页面；标准版跳转销售出库新建；专业版:：跳转销售订单新建  
     //  240611 恢复成开单
     // if (this.data.gradeCode == 'STD') { //标准版  
     //   url = that.data.route.salesOutbound.url

utils/Constants.js

@@ -135,7 +135,7 @@ module.exports = {
   // 体验企业信息
   testCpList: [{
     cpId: 2,
-    cpName: '东科智云-免费版-体验',
+    cpName: '东科智云-标准版-体验',
     svcCode: 'dkic_b1',
     openid: 'std_test',
     svcIp: 'http://127.0.0.1',