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

i18n/zh-CN.js

@@ -425,7 +425,7 @@ const pur = {
   purchaseReturnReversal : "采购退货冲正",
   reverseAndReopen : "冲正重开",
   purchaseCancellation : "采购作废",
-  staging : "采购作废",
+  staging : "暂存",
   deal : "成交",
   sumTotalAmount : "共计金额",
   receivingDate : "收货日期",

package-base-select/pages/select-income-category/select-income-category.js

@@ -17,10 +17,12 @@ Page({
   data: {
         // 弹出按钮
         buttonList: [{
+          code: "add",
           name: 'merge',
           color:'#C7A974',
           title: '新建'
         },{
+          code: "save",
           name: 'merge',
           title: '确定'
         }],
@@ -465,12 +467,40 @@ changeTag(e) {
     })
 
   },
-
   /**
-    * 生命周期函数--监听页面加载
-    */
-  onLoad(options) {
-    console.log("onLoad");
-  },
+   * @desc : 按钮点击事件回调
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  open(e) {
+    let that = this
+     let code = e.detail.name
+     if (code == "add") { //新建事件
+   
+     }
+     if (code == "save") { //选择确定
+       let  list = this.data.tableData
+       let chooseList = [] //
+       let alreadyList =  this.data.alreadyList //之前已经选择的  
+       let tempList = list.filter(itt => {
+        return itt.checked
+      })
+      chooseList = alreadyList.concat(tempList)
+    
+       if (!(chooseList && chooseList.length > 0)) {
+         wx.showToast({
+           title: mixins.$t('pleaseChoose'),//"请至少选择一件商品" ,
+           icon: 'none'
+         })
+       }
+       wx.navigateTo({
+        url: that.data.route.openPurchase.url,   
+        success: function (res) { 
+          res.eventChannel.emit('params', {choooseItemList: chooseList })
+        }
+      })
+     }
+ 
+   },
 
 })

package-base-select/pages/select-income-category/select-income-category.wxml

@@ -41,4 +41,4 @@
 
 <view style="height: 200rpx;"></view>
 <!-- 新建按钮 -->
-<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}"   buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="save"></dk-save-button>
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}"   buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="open"></dk-save-button>

package-base-select/pages/select-income-category/select-income-category.wxss

@@ -20,23 +20,8 @@
   left: 34rpx;
   height: 78rpx;
 }
-/**扫一扫**/
-.scan-class{
-  position: fixed;
-  top: 107rpx;
-  right: 34rpx;
-  width: 122rpx;
-  height: 65rpx;
-  background: #1B365D;
-  border-radius: 15rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.scan-image{
-  width: 48rpx;
-  height: 36rpx;
-}
+ 
+ 
 
 /** 查询**/
 .van-search {
@@ -230,14 +215,7 @@
 }
 
 
-/**产品条目的样式**/
-.goods-item-class{
-  background: #FBF6EF;
-  border-radius: 15rpx ;
-  display: flex;
-  text-align: left;
-  width: 100%;
-}
+ 
 
 .goods-item-selected-cell-class{
   padding-right: 10rpx !important;