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

# Conflicts:
#	package-base-select/pages/select-data/select-data.wxml

api/pages/ivt/inbound.js

@@ -22,7 +22,7 @@ module.exports = {
       inProcessing: { key: 'inProcessing', method: 'inProcessing', primaryKey: 'intoId', image: 'btn-warehousing-processing.png'}, //入库办理
       editInbound: { key: 'editInbound', method: 'editInbound', primaryKey: 'intoId', image: 'btn-edit.png'}, //编辑
       invaidOrder: { key: 'invaidOrder', method: 'invaidOrder',image: 'btn-void.png',question:true  },//作废
-      ticketPirnt: { key: 'ticketPirnt', method: 'ticketPirnt', primaryKey: 'rpId', image:'btn-printing.png' },//打印
+      printedBill: { key: 'printedBill', method: 'printedBill', primaryKey: 'rpId', image:'btn-printing.png' },//打印
       addReturn:{
         key:'addReturn',url:'/package-purchase/pages/purchase-return/add/add',formMode:'add'
       }, 

api/pages/mst/supplier.js

@@ -19,10 +19,10 @@ module.exports = {
       add: { key: 'add', url: '/package-purchase/pages/supplier-list/add/add'  },
       edit: { key: 'edit', url: '/package-purchase/pages/supplier-list/add/add'  },
       chooseSupplierCategory: { key: 'chooseSupplierCategory', url: '/package-base-select/pages/select-data/select-data',type:'kindData', kindType:'供应商类别' },
-      chooseServiceCategory: { key: 'chooseServiceCategory', url: '/package-base-select/pages/select-data/select-data',type:'kindData', kindType:'服务类别' , chooseFlag:'ture' },
+      chooseServiceCategory: { key: 'chooseServiceCategory', url: '/package-base-select/pages/select-data/select-data',type:'kindData', kindType:'服务类别' , chooseFlag:true },
       chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },
       chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-data/select-data',type:'org' }, 
-      chooseBrandy: { key: 'chooseBrandy',url: '/package-base-select/pages/select-data/select-data',type:'brand', chooseFlag:'ture',repeatFlag:'false'}, 
+      chooseBrandy: { key: 'chooseBrandy',url: '/package-base-select/pages/select-data/select-data',type:'brand', chooseFlag: true,repeatFlag:false}, 
     }
   }
 };

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

@@ -51,8 +51,6 @@ Page({
     popContent: null,
     // 是否有默认值
     defaultFlag: false,
-    // 简单模式
-    simpleFlag: false,
     // 确定按钮
     buttonList: [{
       name: 'confirm',
@@ -95,6 +93,7 @@ Page({
    * @date : 2024/3/25 15:16
    */
   chooseData(e) {
+    console.log('eerere',e);
     let list = e.detail.list;
     let item = e.detail.item;
     let valueKey = this.data.valueKey;

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

@@ -1,7 +1,11 @@
 <loading wx:if="{{loading}}"></loading>
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <van-sticky scroll-top="0">
+<<<<<<< HEAD
   <view id="stickyView" style="height: {{(chooseFlag || (tagList && tagList.length > 0))?'190rpx': ((searchContent && searchContent.length > 0)?'200rpx':'90rpx')}}">
+=======
+  <view style="height: {{(chooseFlag || (tagList && tagList.length > 0))?'210rpx': ((searchContent && searchContent.length > 0)?'200rpx':'120rpx')}}">
+>>>>>>> 25849cd66c3de72fdd910c5b873d14c868ea7962
     <!-- 查询条件 -->
     <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,placeholder)}}">
     </dk-dropdown-menu>
@@ -17,20 +21,25 @@
 <!-- 暂无数据 -->
 <van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}" />
 <!--简单列表-->
-<view wx:if="{{simpleFlag}}" style="margin-top:30rpx;">
+<!-- <view wx:if="{{simpleFlag}}" style="margin-top:30rpx;">
   <view wx:for="{{tableData}}" data-item="{{item}}" wx:key="index" class="main-class main-item-class" style="{{item.checked? 'border: 1px solid #1B365D;':''}}" data-index="{{index}}" catchtap="choose">
     {{item[title]}}
   </view>
-</view>
+</view> -->
 
+<<<<<<< HEAD
 <!-- 列表区 防止遮住 TODO-->
 <view style="{{'margin-top:' +  heightList + 'rpx'}}">
   <dk-list wx:if="{{!simpleFlag && active == 0}}" id="list" list="{{tableData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}" chooseFlag="{{chooseFlag}}" bind:toDetail="toDetail" bind:choose="chooseData"></dk-list>
 </view>
+=======
+<!-- 列表区 防止遮住 -->
+<dk-list wx:if="{{ active == 0}}" id="list" simpleFlag="{{simpleFlag}}" list="{{tableData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}" chooseFlag="{{chooseFlag}}" bind:toDetail="toDetail" bind:choose="chooseData"></dk-list>
+>>>>>>> 25849cd66c3de72fdd910c5b873d14c868ea7962
 
 
 <!-- 已选列表区 -->
-<dk-list wx:if="{{ !simpleFlag && chooseFlag && active == 1}}" id="choosed" list="{{choosedData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" simpleFlag="{{simpleFlag}}" content="{{contentList}}" footerInfo="{{footerInfo}}" swipeDisabled="{{false}}" swipeDeleteFlag="{{true}}" bind:swipe="delChoosed"></dk-list>
+<dk-list wx:if="{{   chooseFlag && active == 1}}" id="choosed" list="{{choosedData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" simpleFlag="{{simpleFlag}}" content="{{contentList}}" footerInfo="{{footerInfo}}" swipeDisabled="{{false}}" swipeDeleteFlag="{{true}}" bind:swipe="delChoosed"></dk-list>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 <view style="height: 200rpx;"></view>

package-purchase/pages/purchase-order/purchase-order.js

@@ -205,7 +205,55 @@ Page({
     primaryKey: 'purId'
   },
 
+  /**
+   * @desc : 三个小点点击回调
+   * @date : 2024年3月8日
+   * @author : 姜永辉
+   */
+  toPoint(e) {
+    let item = e.detail.item
+    let buttonList = null
+    if (!item.flgValid) { //作废
+      buttonList = [{
+        name: 'printedBill',
+        title: mixins.$t('printedBill') //打印票据
+      }, ] //打印
+    } else {
+
+      buttonList = [{
+          name: 'transferToWarehouse',
+          title: mixins.$t('transferToWarehouse'), //转入库 
+          formMode: Constants.formMode.other,
+          other: {
+            idKey: 'purId'
+          },
+        }, {
+          name: 'editPur',
+          title: mixins.$t('edit'),
+        }, {
+          name: 'purchaseCancellation',
+          title: mixins.$t('purchaseCancellation'), //采购作废 
+        }, //title:mixins.$t('followUp') 
+        {
+
+          name: 'selectSourcePurchaseOrder',
+          title: mixins.$t('purReturnOutBound'), //采购退货
+          formMode: Constants.formMode.index,
+          formType: Constants.formMode.add,
+          idKey: 'purId',
+        },
+        {
+          name: 'printedBill',
+          title: mixins.$t('printedBill') //打印票据
+        },
 
+      ]
+    }
+    this.setData({
+      // 弹出按钮
+      popbuttonList: buttonList
+    })
+  },
   /**
    * @desc : 作废
    * @date : 2024/2/1 15:49
@@ -339,22 +387,22 @@ Page({
           res.statusName = res.intoStatusName
         }
       });
-    }  
+    }
     sumAmount = tableData.sum('sumAmount')
-    sumQuantity = tableData.sum('sumQuantity') 
+    sumQuantity = tableData.sum('sumQuantity')
     contentnFootList.forEach(it => {
       if (it.code == 'count') {
         it.bill = tableData.length
-        it.quantity = sumQuantity 
+        it.quantity = sumQuantity
       }
       if (it.code == 'totalAmount') {
         it.content = sumAmount
       }
-    }) 
+    })
     this.setData({
       contentnFootList: contentnFootList,
       tableData: tableData
-    })  
+    })
   },
   /**
    * @desc : 详细页面 （编辑）

package-purchase/pages/purchase-receipt/purchase-receipt.js

@@ -33,8 +33,8 @@ Page({
         title: mixins.$t('invaidOrder'),
       },
       {
-        name: 'ticketPirnt',
-        title: mixins.$t('ticketPirnt'),
+        name: 'printedBill',
+        title: mixins.$t('printedBill'),
       },
     ],
     // 弹出按钮
@@ -158,7 +158,26 @@ Page({
     // 路由
     routeObjName: 'inbound',
   },
+/**
+   * @desc :   三个小点打开
+   * @date : 2024年3月8日
+   * @author : 于继渤 
+   */
+  toPoint(e) {
+    let item = e.detail.item
+    let buttonList = null
+    if (!item.flgValid) { //作废
+      buttonList = [{
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, ] //打印
 
+    }  this.setData({
+      // 弹出按钮
+      pointButtonList: buttonList
+    })
+   
+  },
   /**
    * @desc : （编辑）
    * @date : 2024/2/1 15:49
@@ -281,21 +300,7 @@ Page({
       }
     })
   },
-  pupButtons() {
-    return [{
-        name: 'editInbound',
-        title: mixins.$t('edit'),
-      },
-      {
-        name: 'invaidOrder',
-        title: mixins.$t('invaidOrder'),
-      },
-      {
-        name: 'ticketPirnt',
-        title: mixins.$t('ticketPirnt'),
-      },
-    ];
-  },
+   
 
   /**
    * @desc : 切换  待出库  已出库
@@ -306,8 +311,7 @@ Page({
    */
   onChangeTabs(e) {
     let index = e.detail.detail.index
-    let flgHandleSetting = this.data.flgHandleSetting
-    let pupButtons = this.pupButtons()
+    let flgHandleSetting = this.data.flgHandleSetting 
     this.setData({
       active: index,
     })
@@ -328,8 +332,8 @@ Page({
               title: mixins.$t('invaidOrder'),
             },
             {
-              name: 'ticketPirnt',
-              title: mixins.$t('ticketPirnt'),
+              name: 'printedBill',
+              title: mixins.$t('printedBill'),
             },
           ]
         });
@@ -345,8 +349,8 @@ Page({
               title: mixins.$t('invaidOrder'),
             },
             {
-              name: 'ticketPirnt',
-              title: mixins.$t('ticketPirnt'),
+              name: 'printedBill',
+              title: mixins.$t('printedBill'),
             },
           ]
         });
@@ -363,8 +367,8 @@ Page({
               title: mixins.$t('invaidOrder'),
             },
             {
-              name: 'ticketPirnt',
-              title: mixins.$t('ticketPirnt'),
+              name: 'printedBill',
+              title: mixins.$t('printedBill'),
             },
           ]
         });
@@ -380,8 +384,8 @@ Page({
             },
           
             {
-              name: 'ticketPirnt',
-              title: mixins.$t('ticketPirnt'),
+              name: 'printedBill',
+              title: mixins.$t('printedBill'),
             },
           ]
         });
@@ -500,7 +504,7 @@ Page({
    */
   loadInit() {
     let flgHandleSetting = this.data.flgHandleSetting
-    let pupButtons = this.pupButtons()
+ 
     if (flgHandleSetting) { //自动的话 要隐藏作废
       // 如果flgHandleSetting为true，则先添加inProcessing按钮，再添加通用按钮  
       this.setData({
@@ -517,8 +521,8 @@ Page({
             title: mixins.$t('invaidOrder'),
           },
           {
-            name: 'ticketPirnt',
-            title: mixins.$t('ticketPirnt'),
+            name: 'printedBill',
+            title: mixins.$t('printedBill'),
           },
         ]
       });
@@ -534,8 +538,8 @@ Page({
             title: mixins.$t('edit'),
           },
           {
-            name: 'ticketPirnt',
-            title: mixins.$t('ticketPirnt'),
+            name: 'printedBill',
+            title: mixins.$t('printedBill'),
           },
         ]
       });

package-purchase/pages/purchase-return/purchase-return.js

@@ -59,7 +59,34 @@ Page({
       quantity: 0
     }],
   },
-
+  /**
+   * @desc :   三个小点打开
+   * @date : 2024年3月8日
+   * @author : 于继渤 
+   */
+  toPoint(e) {
+    let item = e.detail.item
+    let buttonList = null
+    if (!item.flgValid) { //作废
+      buttonList = [{
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, ] //打印
+    } else {
+      // 弹出按钮
+      buttonList = [{
+        name: 'editInto',
+        title: mixins.$t('edit'),
+      }, { name: 'invalid', title: mixins.$t("invaidOrder") },{
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, ]
+    }
+    this.setData({
+      // 弹出按钮
+      buttonList: buttonList
+    })
+  },
   /**
  * @desc : 跳转明细
  * @date : 2024/2/1 15:49

package-sales/pages/customer-collection/customer-collection.js

@@ -154,27 +154,34 @@ Page({
   */
   toPoint(e) {
     let item = e.detail.item
+    let buttonList = null
+    if (!item.flgValid) { //作废
+      buttonList = [{
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, ] //打印
+    } else {  
     if (item.rpType == Constants.rpType.returnReceipt) {
-      this.setData({
-        buttonList:
-          [
-            { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
-            { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
-          ]
-      })
+      buttonList=
+      [
+        { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
+        { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
+      ]
     } else {
-      this.setData({
-        buttonList:
-          [
-            {
-              name: 'cusReturnCollection',
-              title: mixins.$t("cusReturnCollection")
-            },
-            { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
-            { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
-          ]
-      })
-    }
+      buttonList =
+      [
+        {
+          name: 'cusReturnCollection',
+          title: mixins.$t("cusReturnCollection")
+        },
+        { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
+        { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
+      ]
+    }}
+    this.setData({
+      // 弹出按钮
+      buttonList: buttonList
+    })
   },
 
   /**

package-sales/pages/order-billing/order-billing.js

@@ -17,32 +17,94 @@ Page({
    * 页面的初始数据 
    */
   data: {
-    tagList: [{ title: "全部", code: '' }, { title: "待出库", code: ['出库状态-待出库'] }, { title: "已出库", code: ['出库状态-出库中', '出库状态-已出库'] }],
+    tagList: [{
+      title: "全部",
+      code: ''
+    }, {
+      title: "待出库",
+      code: ['出库状态-待出库']
+    }, {
+      title: "已出库",
+      code: ['出库状态-出库中', '出库状态-已出库']
+    }],
     routeObjName: 'order',
     // 查询条件
-    searchContent: [
-      { code: 'createtime', title: mixins.$t("pastThirthtyDays"), defaultValue: 5, searchType: Constants.searchType.date },
-      { code: 'staff', title: mixins.$t("staffId"), dropType: 'staff' },
-      { code: 'org', title: mixins.$t("orgId"), dropType: 'org' },
-      { code: 'choose', title: mixins.$t("choose"), searchType: Constants.searchType.pick }
+    searchContent: [{
+        code: 'createtime',
+        title: mixins.$t("pastThirthtyDays"),
+        defaultValue: 5,
+        searchType: Constants.searchType.date
+      },
+      {
+        code: 'staff',
+        title: mixins.$t("staffId"),
+        dropType: 'staff'
+      },
+      {
+        code: 'org',
+        title: mixins.$t("orgId"),
+        dropType: 'org'
+      },
+      {
+        code: 'choose',
+        title: mixins.$t("choose"),
+        searchType: Constants.searchType.pick
+      }
     ],
     // 查询条件-筛选
-    pullMenuList: [
-      { code: 'outStatus', pullType: 'mSelect', typeName: 'outStatus' },
-      { code: 'receiveStatus', pullType: 'mSelect', typeName: 'receiveStatus' },
-      { code: 'deliveryDate', dataType: 'date' },
-      { code: 'viewVoidedDocuments', dataType: 'checkbox' },
+    pullMenuList: [{
+        code: 'outStatus',
+        pullType: 'mSelect',
+        typeName: 'outStatus'
+      },
+      {
+        code: 'receiveStatus',
+        pullType: 'mSelect',
+        typeName: 'receiveStatus'
+      },
+      {
+        code: 'deliveryDate',
+        dataType: 'date'
+      },
+      {
+        code: 'viewVoidedDocuments',
+        dataType: 'checkbox'
+      },
     ],
     // 列表区（脚部金额）
-    footerAmount: { name: 'sumAmount', title: mixins.$t("totalAmount") },
+    footerAmount: {
+      name: 'sumAmount',
+      title: mixins.$t("totalAmount")
+    },
     // 列表区（脚部信息）
-    footerInfo: [{ name: 'sumQuantity', title: mixins.$t("piece"), prefix: mixins.$t("together"), }],
+    footerInfo: [{
+      name: 'sumQuantity',
+      title: mixins.$t("piece"),
+      prefix: mixins.$t("together"),
+    }],
     // 列表区（内容）
-    contentList: [
-      { name: 'orderNo', title: mixins.$t("saleOrderNo") },
-      { name: 'cusPhone', title: mixins.$t("cusPhone")},
-      { name: 'addressFull', title: mixins.$t("adddressFull") },
-      { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: mixins.$t("staffId") }], title: mixins.$t("storeInformation") }
+    contentList: [{
+        name: 'orderNo',
+        title: mixins.$t("saleOrderNo")
+      },
+      {
+        name: 'cusPhone',
+        title: mixins.$t("cusPhone")
+      },
+      {
+        name: 'addressFull',
+        title: mixins.$t("adddressFull")
+      },
+      {
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: mixins.$t("staffId")
+        }],
+        title: mixins.$t("storeInformation")
+      }
     ],
 
     contentObj: {
@@ -83,23 +145,50 @@ Page({
       }]
     },
     // 弹出按钮
-    buttonList: [
-      {
+    buttonList: [{
         name: 'editInto',
         title: mixins.$t('edit')
       },
-      { name: 'saleOutBound', title: mixins.$t("saleOutBound"), formMode: Constants.formMode.other, other: { idKey: 'orderId' } },//出库
       {
-        name: 'saleOrderReturn', title: mixins.$t("saleReturn"), formMode: Constants.formMode.other, other: {
+        name: 'saleOutBound',
+        title: mixins.$t("saleOutBound"),
+        formMode: Constants.formMode.other,
+        other: {
           idKey: 'orderId'
         }
-      },//退货
-      { name: 'collection', title: mixins.$t("cusCollection"), idKey: 'cusId' },//跳转客户收款
-      { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
-      { name: 'invalid', title: mixins.$t("invaidOrder") } //作废
+      }, //出库
+      {
+        name: 'saleOrderReturn',
+        title: mixins.$t("saleReturn"),
+        formMode: Constants.formMode.other,
+        other: {
+          idKey: 'orderId'
+        }
+      }, //退货
+      {
+        name: 'collection',
+        title: mixins.$t("cusCollection"),
+        idKey: 'cusId'
+      }, //跳转客户收款
+      {
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, //打印
+      {
+        name: 'invalid',
+        title: mixins.$t("invaidOrder")
+      } //作废
     ],
-    buttonSaveList: [{ code: 'add', title: mixins.$t("add") }],
-    contentSaveList: [{ code: 'amount', content: 0, type: 'number', title: mixins.$t("totalAmount") }, {
+    buttonSaveList: [{
+      code: 'add',
+      title: mixins.$t("add")
+    }],
+    contentSaveList: [{
+      code: 'amount',
+      content: 0,
+      type: 'number',
+      title: mixins.$t("totalAmount")
+    }, {
       type: 'count',
       code: 'count',
       bill: 0,
@@ -108,10 +197,65 @@ Page({
     primaryKey: 'orderId'
   },
   /**
-  * @desc :   处理接口返回数据
-  * @date : 2024年3月8日
-  * @author : 于继渤
-  */
+   * @desc :   三个小点打开
+   * @date : 2024年3月8日
+   * @author : 于继渤 
+   */
+  toPoint(e) {
+    let item = e.detail.item
+    let buttonList = null
+    if (!item.flgValid) { //作废
+      buttonList = [{
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, ] //打印
+    } else {
+      // 弹出按钮
+      buttonList = [{
+          name: 'editInto',
+          title: mixins.$t('edit')
+        },
+        {
+          name: 'saleOutBound',
+          title: mixins.$t("saleOutBound"),
+          formMode: Constants.formMode.other,
+          other: {
+            idKey: 'orderId'
+          }
+        }, //出库
+        {
+          name: 'saleOrderReturn',
+          title: mixins.$t("saleReturn"),
+          formMode: Constants.formMode.other,
+          other: {
+            idKey: 'orderId'
+          }
+        }, //退货
+        {
+          name: 'collection',
+          title: mixins.$t("cusCollection"),
+          idKey: 'cusId'
+        }, //跳转客户收款
+        {
+          name: 'printedBill',
+          title: mixins.$t("printedBill")
+        }, //打印
+        {
+          name: 'invalid',
+          title: mixins.$t("invaidOrder")
+        } //作废
+      ]
+    }
+    this.setData({
+      // 弹出按钮
+      buttonList: buttonList
+    })
+  },
+  /**
+   * @desc :   处理接口返回数据
+   * @date : 2024年3月8日
+   * @author : 于继渤
+   */
   handleSearchData(tableData) {
     tableData.forEach(res => {
       if (res.outStatus !== Constants.outStatus.unOutBound) { //处理状态
@@ -129,10 +273,10 @@ Page({
   },
 
   /**
-  * @desc :   作废
-  * @date : 2024年3月8日
-  * @author : 于继渤
-  */
+   * @desc :   作废
+   * @date : 2024年3月8日
+   * @author : 于继渤
+   */
   invalid(e) {
     this.setData({
       loading: true
@@ -154,10 +298,10 @@ Page({
   },
 
   /**
-    * @desc :   销售出库方法提示校验
-    * @date : 2024年3月8日
-    * @author : 于继渤
-    */
+   * @desc :   销售出库方法提示校验
+   * @date : 2024年3月8日
+   * @author : 于继渤
+   */
   isAllowedSaleOutBound(e) {
     let result = ''
     //判断出库量是否小于订单量
@@ -167,10 +311,10 @@ Page({
     return result
   },
   /**
-    * @desc :   销售出库退货方法提示校验
-    * @date : 2024年3月8日
-    * @author : 于继渤
-    */
+   * @desc :   销售出库退货方法提示校验
+   * @date : 2024年3月8日
+   * @author : 于继渤
+   */
   isAllowedSaleOrderReturn(e) {
     console.log(e)
     let result = ''
@@ -184,10 +328,10 @@ Page({
 
 
   /**
- * @desc : 切换
- * @date : 2024/2/1 15:49
- * @author : 于继渤
- */
+   * @desc : 切换
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   onChangeTabs(e) {
     let code = e.detail.detail.code
     this.setData({
@@ -196,10 +340,10 @@ Page({
     this.searchData()
   },
   /**
-* @desc : 设置查询参数
-* @date : 2024/2/1 15:49
-* @author : 于继渤
-*/
+   * @desc : 设置查询参数
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   setSearchParams(params) {
     if (!params.outStatusList) {
       params.outStatusList = this.data.outStatus == 'all' ? [] : this.data.outStatus
@@ -210,33 +354,37 @@ Page({
     return params
   },
   /**
-     * @desc : 加载数据
-     * @author : 于继渤
-     * @date : 2024/1/23 9:16
-     */
+   * @desc : 加载数据
+   * @author : 于继渤
+   * @date : 2024/1/23 9:16
+   */
   getData(params) {
     return this.excute(this.data.service, this.data.service.selectByCond, params);
   },
   /**
-     * @desc : 编辑
-     * @author : 于继渤
-     * @date : 2024/1/23 9:16
-     */
+   * @desc : 编辑
+   * @author : 于继渤
+   * @date : 2024/1/23 9:16
+   */
   editInto(e) {
     let item = e
     wx.navigateTo({
       url: this.data.route.add.url,
       success: function (res) {
         // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
-        res.eventChannel.emit('params', { id: item.orderId, formMode: Constants.formMode.edit, item: item })
+        res.eventChannel.emit('params', {
+          id: item.orderId,
+          formMode: Constants.formMode.edit,
+          item: item
+        })
       }
     })
   },
   /**
-  * @desc :   计算底部合计金额等
-  * @date : 2024年4月8日
-  * @author : 于继渤
-  */
+   * @desc :   计算底部合计金额等
+   * @date : 2024年4月8日
+   * @author : 于继渤
+   */
   calculateTotalAmount() {
     let tableData = this.data.tableData
     let contentSaveList = this.data.contentSaveList

package-sales/pages/order-return/order-return.js

@@ -95,6 +95,39 @@ Page({
     routeObjName: 'saleOutBoundReturn',
     active: 0
   },
+    /**
+   * @desc :   三个小点打开
+   * @date : 2024年3月8日
+   * @author : 于继渤 
+   */
+  toPoint(e) {
+    let item = e.detail.item
+    let buttonList = null
+    if (!item.flgValid) { //作废
+      buttonList = [{
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, ] //打印
+    } else { 
+      // 弹出按钮
+      buttonList = [
+        {
+          name: 'editInto',
+          title: mixins.$t('edit')
+        },
+        { name: 'salesOutReturnBound', title: mixins.$t("outProcessing") },
+        {
+          name: 'printedBill',
+          title: mixins.$t('printedBill') //打印票据
+        },
+        { name: 'invalid', title: mixins.$t("invaidOrder") } //作废
+      ]
+    }
+    this.setData({
+      // 弹出按钮
+      buttonList: buttonList
+    })
+  },
   /**
  * @desc : 切换
  * @date : 2024/2/1 15:49