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

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

@@ -514,7 +514,13 @@ mixins: [mixins],
       } else if (this.data.formType == 7) {
         return this.excute(this.data.otherReceivableService, this.data.otherReceivableService.insert, this.data.params)
       } else if (this.data.formType == 8) {
-        return this.excute(this.data.orderService, this.data.orderService.insert, this.data.params);
+
+        if(this.data.params.updateFlag){
+          return this.excute(this.data.orderService, this.data.orderService.update, this.data.params);
+        }else{
+          return this.excute(this.data.orderService, this.data.orderService.insert, this.data.params);
+        }
+        
       } else if (this.data.formType == 9) {
         return this.excute(this.data.otherPayableService, this.data.otherPayableService.insert, this.data.params);
       }

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

@@ -17,7 +17,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    
+
     firstFlag: true,
     orderBy: [{
       "text": "可售量升序",
@@ -78,13 +78,13 @@ Page({
     contentList: []
   },
   selectedProduct(e) {
-    if(e.currentTarget.dataset.active == 0&&this.data.controlFlags&& this.data.controlFlags.choosewhFlag){
+    if (e.currentTarget.dataset.active == 0 && this.data.controlFlags && this.data.controlFlags.choosewhFlag) {
       this.setData({
         searchContent: [
-          { code: 'whId', title: mixins.$t('whName'), dropType: 'warehouse',searchType:'dropSingle' }, 
+          { code: 'whId', title: mixins.$t('whName'), dropType: 'warehouse', searchType: 'dropSingle' },
         ],
       })
-    }else{
+    } else {
       this.setData({
         searchContent: [],
       })
@@ -240,10 +240,10 @@ Page({
       //controlFlags.paramsByWhId 查询商品列表 是否开启顶部选择库区的 库区id 作为参数查询  
       //controlFlags.choosewhReadonly 顶部的选择库区是否可点击选择  直接用布尔值在xml控制了
       //controlFlags.chooseWhByUserDefault 顶部的选择库区是否选择用户默认的库区
-      if(controlFlags.choosewhFlag){
+      if (controlFlags.choosewhFlag) {
         this.setData({
           searchContent: [
-            { code: 'whId', title: mixins.$t('whName'), dropType: 'warehouse',searchType:'dropSingle' }, 
+            { code: 'whId', title: mixins.$t('whName'), dropType: 'warehouse', searchType: 'dropSingle' },
           ],
         })
       }
@@ -350,13 +350,29 @@ Page({
           element.skuImages.forEach(item => {
             item.url = config.image_url + item.path
           });
-          element.imagesUrl =   element.skuImages[0].url
-        } 
+          element.imagesUrl = element.skuImages[0].url
+        }
       })
       this.setData({
         tableData: tableData
       })
     }
+    if (this.data.billType == 'sale' || this.data.billType == 'saleOut' || this.data.billType == 'saleOutReturn') {
+      //处理图片
+      if (tableData && tableData.length > 0) {
+        tableData.forEach(item => {
+          if (item.skuImages && item.skuImages.value) {
+            item.skuImages.value = JSON.parse(item.skuImages.value)
+            console.log('item.skuImages.value', item.skuImages.value[0].url)
+            item['imagesUrl'] = item.skuImages.value.length > 0 ? item.skuImages.value[0].url : null
+          }
+        })
+        this.setData({
+          tableData: tableData
+        })
+      }
+    }
+
 
     if (this.data.controlFlags && this.data.controlFlags.sourcePage == "inventory-adjustment") { //库存调整 设置
       let popContent = this.data.popContent
@@ -380,7 +396,7 @@ Page({
           res.nonStdCode = ''
         })
       }
-   
+
       this.setData({
         popContent: popContent,
         tableData: tableData
@@ -447,10 +463,10 @@ Page({
         skuId: item.skuId,
         cpId: app.globalData.company.cpId,
         nonStdCode: item.nonStdCode,
-      }).then(it=>{
-        if(it.length > 0){
-          console.log('invId',it[0].invId)
-          console.log('invQty',it[0].invQty)
+      }).then(it => {
+        if (it.length > 0) {
+          console.log('invId', it[0].invId)
+          console.log('invQty', it[0].invQty)
           item.invId = it[0].invId
           item.invQty = it[0].invQty
           item.usableQty = it[0].usableQty
@@ -458,9 +474,9 @@ Page({
             dataItem: JSON.stringify(item)
           })
         }
-      
+
       })
-      console.log('item',item)
+      console.log('item', item)
     }
     if (this.data.item == Constants.billType.sale) {
       item.nonStdCode = item.nonStdCode ? item.nonStdCode : '-'

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

@@ -45,6 +45,7 @@
       <view wx:for="{{tableData}}" wx:key="index" border="{{ false }}" class="goods-cell-class" data-item="{{item}}" bind:tap="openAddItemInfo">
         <view class="goods-item-class">
           <view> 
+          
             <van-image radius="15rpx" custom-class="goods-item-image" fit="fill" src="{{item.imagesUrl}}" />
           </view>
           <view style="margin-left: 26rpx;width: 100%; ">
@@ -261,15 +262,15 @@
 
 
 
-<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' }}" type="sale"   descCol="skuName" titleTagCol="brandName" titleCol="skuModel" priceCol="pricePromotion" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="参考价："  priceCol="pricePurchase" contentObj="{{popContent}}" bind:commit="editItems">
+<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' }}" type="sale"   descCol="skuName" titleTagCol="brandName" titleCol="skuModel" iconCol="imagesUrl" priceCol="pricePromotion" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="参考价："  priceCol="pricePurchase" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>
 
 
 
-<dk-popup wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="brandName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems">
+<dk-popup wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="brandName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" iconCol="imagesUrl" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>
 
-<dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="brandName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems" popupTopObj="{{popupTopObj}}">
+<dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="brandName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" iconCol="imagesUrl" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems" popupTopObj="{{popupTopObj}}">
 </dk-popup>
 
 <dk-save-button  cssType="sale" model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="submit"></dk-save-button>

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

@@ -54,7 +54,7 @@ Page({
 
     //按钮
     buttonSaveList: [
-      { code: 'collection', title: '收款',plain:true }
+      { code: 'collection', title: '收款', plain: true }
     ],
     contentSaveList: [
       { code: 'need', title: '需收款', type: 'str' },
@@ -79,27 +79,29 @@ Page({
     cardList[0].sumStandard = data.data.sumStandard
     cardList[0].sumQuantity = data.data.sumQuantity
     cardList[0].saleDiscount = data.data.saleDiscount
-    contentSaveList[1]['content']  = data.data.sumAmount
+    contentSaveList[1]['content'] = data.data.amtResidue
+
 
-    
     this.setData({
       item: data.data,
-      contentSaveList:contentSaveList,
+      contentSaveList: contentSaveList,
       formData: JSON.stringify(formData),
       cardList: cardList
     })
   },
 
-  saveButton(){
+  saveButton() {
     let formData = JSON.parse(this.data.formData)
     let item = {}
-    item.objInfo = {}
-    item.objInfo['cusPhone'] = formData.cusPhone
-    item.objInfo['cusName'] = formData.cusName
-    item.objInfo['objectId'] = formData.cusId
-    item.objInfo['addressFull'] = formData.addressFull
-
-
+    formData.objInfo = {}
+    formData.objInfo['cusPhone'] = formData.cusPhone
+    formData.objInfo['cusName'] = formData.cusName
+    formData.objInfo['objectId'] = formData.cusId
+    formData.objInfo['addressFull'] = formData.addressFull
+    formData.sumAmount = formData.amtResidue
+    formData.deleteItemList = []
+    formData.itemList = formData.goodsList
+    formData.updateFlag = true
     let _this = this
     wx.navigateTo({
       url: this.data.route.selectCollectionConfirm.url,
@@ -115,7 +117,7 @@ Page({
       success: function (res) {
         //设置参数
         //let item = _this.setSaveData()
-        res.eventChannel.emit('params', { item: JSON.stringify(item), formType: 8 })
+        res.eventChannel.emit('params', { item: JSON.stringify(formData), formType: 8 })
       }
     })
   },
@@ -130,28 +132,28 @@ Page({
     return this.excute(this.data.service, this.data.service.getOrderForUpdate + '/' + this.data.item.orderId, params);
   },
 
-   /**
-     * @desc : 详细页面 （编辑）
-     * @date : 2024/2/1 15:49
-     * @author : 于继渤
-     */
-    toEdit(e) {
-      let formData = JSON.parse(this.data.formData)
-      let orderId = formData.orderId
-      let that = this
-      wx.navigateTo({
-          url: this.data.route.add.url,
-          events: {
-              // 回调后，在这里给页面赋值
-              bandData: function (e) { 
-              }
-          },
-          success: function (res) {
-              res.eventChannel.emit('params', {
-                  id: orderId,
-                  formMode: Constants.formMode.edit
-              })
-          }
-      })
+  /**
+    * @desc : 详细页面 （编辑）
+    * @date : 2024/2/1 15:49
+    * @author : 于继渤
+    */
+  toEdit(e) {
+    let formData = JSON.parse(this.data.formData)
+    let orderId = formData.orderId
+    let that = this
+    wx.navigateTo({
+      url: this.data.route.add.url,
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {
+        }
+      },
+      success: function (res) {
+        res.eventChannel.emit('params', {
+          id: orderId,
+          formMode: Constants.formMode.edit
+        })
+      }
+    })
   },
 })

package-sales/pages/order-billing/detail/detail.wxml

@@ -6,7 +6,7 @@
   <view class="tags-class">
 
     <view style="width: 33%;text-align: right;">
-      <dk-tag fontSize="14px" border="1rpx solid #95A8CB" height="45rpx" color="transparent" textColor="#002340" radius="10rpx" roundFlag="{{true}}" size="medium" value="{{'未收款'}}"></dk-tag>
+      <dk-tag fontSize="14px" border="1rpx solid #95A8CB" height="45rpx" color="transparent" textColor="#002340" radius="10rpx" roundFlag="{{true}}" size="medium" value="{{(item.amtFactReceipt < item.sumAmount &&  item.amtFactReceipt > 0)? (item.amtFactReceipt == item.sumAmount ? '已收款':'部分收款')  : '未收款'}}"></dk-tag>
     </view>
     <view style="width: 33%;text-align: center;">
       <dk-tag fontSize="14px" border="1rpx solid #95A8CB" height="45rpx" color="transparent" textColor="#002340" radius="10rpx" roundFlag="{{true}}" size="medium" value="{{item.returnQty > 0? '有退货' : '无退货'}}"></dk-tag>

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

@@ -60,7 +60,7 @@ Page({
       { code: 'save', title: mixins.$t("save") }
     ],
     contentSaveList: [
-      { code: 'flag', title: mixins.$t("saleOutBoundFlag"), type: 'checkbox' },
+      { code: 'flag', title: mixins.$t("autoSaleOutBoundFlag"), type: 'checkbox' },
       { code: 'need', title: mixins.$t("saleCollection"), type: 'str' },
       { code: 'receivable', content: 0, type: 'number' }
     ],
@@ -305,11 +305,12 @@ Page({
   setParams(params) {
     let itemIndex = 0
     console.log('params1', params)
+    params.fromId = params.orderId
     params.goodsList.forEach(res => {
-      res['sOutId'] = res.soutId
-      res['sOutItemId'] = res.soutItemId
-      res['sOrderItemId'] = res.sorderItemId
-      res['sOrderId'] = res.sorderId
+      // res['sOutId'] = res.soutId
+      // res['sOutItemId'] = res.soutItemId
+      // res['sOrderItemId'] = res.sorderItemId
+      // res['sOrderId'] = res.sorderId
       res.itemIndex = itemIndex++
       res.canNegativeFlag = true
       if (this.data.formMode != 'detail') {
@@ -528,7 +529,7 @@ Page({
       //标价合计 =  商品标价 x  商品数量
       sumStandard += item.amtStd
       sumAmount += item.outingQty * item.priceOut //没有售价默认取标价
-      sumQuantity += item.orderQty //数量
+      sumQuantity += item.outingQty //数量
     })
     formData.sumStandard = sumStandard
     formData.saleDiscount = Number((sumAmount / sumStandard) * 100).toFixed(2)
@@ -536,6 +537,8 @@ Page({
     formData.canUseCollect = 0
     formData.useCollect = 0
     formData.sumQuantity = sumQuantity
+    formData.outingQty = sumQuantity * -1
+    formData.outingAmt = sumAmount
     let cardList = this.data.cardList
     let contentSaveList = this.data.contentSaveList
     cardList[2].sumAmount = formData.sumAmount

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

@@ -203,8 +203,8 @@ Page({
     let outAmt = Number(0)
     let outQty = Number(0)
     tableData.forEach(res => {
-      outAmt += res.outAmt
-      outQty += res.outQty
+      outAmt += res.sumOutAmt
+      outQty += res.sumOutQty
     })
     contentSaveList[1].content = outAmt
     contentSaveList[1].bill = tableData.length