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

components/dkbase/dk-popup/dk-popup.js

@@ -290,7 +290,7 @@ Component({
         }  
         form[item.code] =  item.type == "step"?Number(form[item.code]):form[item.code] // step 一定是数量 预防字符串0 的数据
         // 如果必须输入，就要进行判断
-        if (item.required && (!form[item.code] || form[item.code] === ""))
+        if (item.required && ((form[item.code] !== 0 && !form[item.code]) || form[item.code] === ""))
         {
           item.errMsg = title + '不为空'
           flag = false;

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

@@ -75,13 +75,15 @@ Page({
       withSubscriptions: true,
       success (res){
         if(res.subscriptionsSetting && res.subscriptionsSetting.mainSwitch){
-          if(res.subscriptionsSetting['z3REuwft6NLPxVW8s5HN1UgWjFstWjD0QfCXNLTa0LA'] && res.subscriptionsSetting['z3REuwft6NLPxVW8s5HN1UgWjFstWjD0QfCXNLTa0LA'] !== "accept"){
+          if(!(res.subscriptionsSetting['z3REuwft6NLPxVW8s5HN1UgWjFstWjD0QfCXNLTa0LA'] && res.subscriptionsSetting['z3REuwft6NLPxVW8s5HN1UgWjFstWjD0QfCXNLTa0LA'] !== "accept")){
             wx.requestSubscribeMessage({
               tmplIds: tmplIds,
               success (res) {
+                // console.log('消息订阅成功', res);
                 that.save(e)
               },
               fail(res) {
+                // console.log('消息订阅取消', res);
                 that.save(e)
               }
             })

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

@@ -30,15 +30,7 @@ Page({
        // 查询条件
    searchContent: [],
     checked:true, //启用标识
-    tagList: [{
-      title: mixins.$t("all") //全部
-    }, {
-      title: mixins.$t("procurementSupplier") //采购供应商
-    },  {
-      title: mixins.$t("outsourcingSupplier") //外协供应商
-    },{
-      title: mixins.$t("serviceProvider") // 服务供应商
-    }], // 假数据 
+    tagList: [], // 假数据 
     
     supplierService: app.globalData['supplierService'],
     contentObj: {
@@ -105,6 +97,15 @@ Page({
    */
   loadInit(){
     if(this.data.gradeCode == Constants.gradeCode.PRO){
+        const tagList = [{
+          title: mixins.$t("all") //全部
+        }, {
+          title: mixins.$t("procurementSupplier") //采购供应商
+        },  {
+          title: mixins.$t("outsourcingSupplier") //外协供应商
+        },{
+          title: mixins.$t("serviceProvider") // 服务供应商
+        }]
         const footerAmount = {
           name: 'payableResidue',
           title: mixins.$t('payAmount')
@@ -114,12 +115,24 @@ Page({
         }]
         this.setData({
           footerAmount: footerAmount,
-          footerInfo: footerInfo
+          footerInfo: footerInfo,
+          tagList: tagList
         })
     }else {
-      console.log('app.globalData', app.globalData);
+      const filters = app.globalData.menus.filter(it => it.objectCode === "pur-order")
+      if(filters.length > 0){
+        const tagList = [{
+          title: mixins.$t("all") //全部
+        }, {
+          title: mixins.$t("procurementSupplier") //采购供应商
+        },  {
+          title: mixins.$t("outsourcingSupplier") //外协供应商
+        }]
+        this.setData({
+          tagList: tagList
+        })
+      }
     }
-         
   },
   /**
    * @desc : 左滑 停用回调

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

@@ -9,7 +9,7 @@
   <!-- 查询条件 --> 
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['supplierName','contactName','contactPhone'])}}">
   </dk-dropdown-menu>
-  <dk-tabs wx:if="{{gradeCode !== 'STD'}}" active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>
+  <dk-tabs active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>
 </van-sticky>