zhoux преди 1 година
родител
ревизия
672d48d9a6
променени са 3 файла, в които са добавени 35 реда и са изтрити 56 реда
  1. 1 1
      components/dkbase/dk-tree-form/dk-tree-form.wxml
  2. 22 43
      package-sales/pages/sales-outbound/sales-outbound.js
  3. 12 12
      pages/mine/mine.js

+ 1 - 1
components/dkbase/dk-tree-form/dk-tree-form.wxml

@@ -14,7 +14,7 @@
         </view>
     </view>
     <!-- 列表下半部分 --> 
-    <view class="{{(item.children && item.children.length > 0 && !item[parentIdKey])?'list-below-item':''}}">
+    <view class="{{(item.children && item.children.length > 0 && !item[parentIdKey] && item.open)?'list-below-item':''}}">
         <view style="width: 100%;">
             <view wx:if="{{item[parentIdKey]}}" style="display:flex;align-items:center;margin-left:{{item[itemListKey].length !== 0 ? depth*40 : depth*60}}rpx;font-size:15px; " class="list-below-item">
                 <!--  -->

+ 22 - 43
package-sales/pages/sales-outbound/sales-outbound.js

@@ -190,27 +190,7 @@ Page({
     }],
 
     // 弹出按钮
-    buttonList: [
-      {
-        name: 'editInto',
-        title: mixins.$t('edit')
-      },
-      { name: 'salesOutbound', title: mixins.$t("outProcessing") },
-      {
-        name: 'saleOrderReturn', title: mixins.$t("saleReturn"), formMode: Constants.formMode.other, other: {
-          idKey: 'outId'
-        },formType:'toSaleOut'
-      },//退货
-      {
-        name: 'cusReturnCollection',formType:Constants.formMode.add,
-        title: mixins.$t("cusReturnCollection")
-      },   
-      { name: 'invalid', title: mixins.$t("invaidOrder") }, //作废    
-      {
-        name: 'printedBill',
-        title: mixins.$t('printedBill') //打印票据
-      },
-    ],
+    buttonList: [],
     // 系统参数
     flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "true" ? true : false,
     // 路由
@@ -224,7 +204,6 @@ Page({
    * @author : 于继渤
    */
   toPoint(e) {
-    console.log('toPoint', e);
     let item = e.detail.item
     let buttonList = null
     //除了已入库 不显示销售退货
@@ -238,14 +217,6 @@ Page({
           title: mixins.$t("outProcessing")
         },
         {
-          name: 'printedBill',
-          title: mixins.$t('printedBill') //打印票据
-        },
-        {
-          name: 'invalid',
-          title: mixins.$t("invaidOrder")
-        }, //作废
-        {
           name: 'saleOrderReturn',
           title: mixins.$t("saleReturn"),
           formMode: Constants.formMode.other,
@@ -255,13 +226,21 @@ Page({
           formType: 'toSaleOut'
         }, //退货 
         {
-          name: 'cusReturnCollection',
-          formType: Constants.formMode.add,
-          title: mixins.$t("cusReturnCollection")
-        }, {
           name: 'cusCollection',
           formType: Constants.formMode.add,
           title: mixins.$t("cusCollection")
+        },{
+          name: 'cusReturnCollection',
+          formType: Constants.formMode.add,
+          title: mixins.$t("cusReturnCollection")
+        },
+        {
+          name: 'invalid',
+          title: mixins.$t("invaidOrder")
+        }, //作废
+        {
+          name: 'printedBill',
+          title: mixins.$t('printedBill') //打印票据
         },
       ]
     } else {
@@ -274,22 +253,22 @@ Page({
           title: mixins.$t("outProcessing")
         },
         {
-          name: 'printedBill',
-          title: mixins.$t('printedBill') //打印票据
+          name: 'cusCollection',
+          formType: Constants.formMode.add,
+          title: mixins.$t("cusCollection")
         },
         {
-          name: 'invalid',
-          title: mixins.$t("invaidOrder")
-        }, //作废 
-        {
           name: 'cusReturnCollection',
           formType: Constants.formMode.add,
           title: mixins.$t("cusReturnCollection")
         },
         {
-          name: 'cusCollection',
-          formType: Constants.formMode.add,
-          title: mixins.$t("cusCollection")
+          name: 'invalid',
+          title: mixins.$t("invaidOrder")
+        }, //作废 
+        {
+          name: 'printedBill',
+          title: mixins.$t('printedBill') //打印票据
         },
       ]
     }

+ 12 - 12
pages/mine/mine.js

@@ -182,20 +182,20 @@ Page({
   */
   handleWxService(e){
     console.log('Constants.WX_SERVICE',Constants.WX_SERVICE);
-    let url= Constants.WX_SERVICE
-    wx.navigateTo({
-      url: '/pages/product/product',
-      success: function (res) {
-        res.eventChannel.emit('url', Constants.WX_SERVICE);
-      }
-    })
-    // wx.openCustomerServiceChat({
-    //   extInfo: {url: Constants.WX_SERVICE},
-    //   corpId: Constants.WX_CPID,
-    //   success(res) {
-    //     console.log('ddd',res);
+    // let url= Constants.WX_SERVICE
+    // wx.navigateTo({
+    //   url: '/pages/product/product',
+    //   success: function (res) {
+    //     res.eventChannel.emit('url', Constants.WX_SERVICE);
     //   }
     // })
+    wx.openCustomerServiceChat({
+      extInfo: {url: Constants.WX_SERVICE},
+      corpId: Constants.WX_CPID,
+      success(res) {
+        console.log('ddd',res);
+      }
+    })
   },
   /**
   * @desc : 跳转到续费页面