2024年7月3日 修改订单 组件 报表

api/pages/sale/order.js

@@ -18,7 +18,8 @@ module.exports = {
     getOrderForOut: 'get_order_for_out', //总单带明显
     getOrderForReturn: 'get_order_for_return',
     countOrderByCond:'count_order_by_cond',
-    invalid: 'invalid'
+    invalid: 'invalid',
+    oneKeyInvalid: 'one_key_invalid' //一键作废
   },
 
   routeUrl: {

components/dkbase/dk-form-bill/dk-form-bill.js

@@ -593,15 +593,20 @@ Component({
         popupTopObj_sku = this.data.popupTopObj
         popContent_sku = popContent_
       } else { //外协品走
-        //  全-免费版-销售出库-新建、编辑、详情-外协品-抽屉不展示库存量、仓库字段
-        popupTopObj_sku = []
-        let index = popContent_.findIndex(element => element.code == 'whId');
-        if (index !== -1) {
-          // 找到了满足条件的元素，index 是它的索引  
-          popContent_sku = popContent_
-          popContent_sku.splice(index, 1)
-        } else {
-          popContent_sku = popContent_
+        //  全-免费版-销售出库-新建、编辑、详情-外协品-抽屉不展示库存量、仓库字段 商品品牌 色号 
+        popContent_sku = popContent_
+        let whId_index = popContent_.findIndex(element => element.code == 'whId');  
+        if (whId_index !== -1) {
+          // 找到了满足条件的元素，index 是它的索引   
+          popContent_sku.splice(whId_index, 1)
+        }  
+        let brandName_index = popContent_.findIndex(element => element.code == 'brandName');
+        if (brandName_index !== -1) {
+          popContent_sku.splice(brandName_index, 1)
+        } 
+        let nonStdCode_index = popContent_.findIndex(element => element.code == 'nonStdCode');
+        if (nonStdCode_index !== -1) {
+          popContent_sku.splice(nonStdCode_index, 1)
         }
       }
       this.setData({

components/dkbase/dk-list-report/dk-list-report.wxml

@@ -68,6 +68,46 @@
       </view>
     </view>
 
+    <!-- 销售汇总表 -->
+    <view wx:if="{{reportNameKey == 'salesum'}}" class="goods-cell-class " catchtap="toDetail" data-item="{{item}}" data-index="{{index}}">
+      <view style="display: flex;">
+        <view>
+          <van-image radius="15rpx" custom-class="goods-item-image" fit="fill" src="{{item.imagesUrl}}" />
+        </view>
+        <view style="margin-left: 26rpx;width: 100%; ">
+          <!-- 标题 -->
+          <view style="display: flex;">
+            <dk-title titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
+          </view>
+          <!-- 描述 -->
+          <view style="display: flex;padding-top: 10rpx;">
+            <dk-text fontSize="24rpx" value="{{item.skuName}}"></dk-text>
+          </view>
+          <view style="display: flex;padding-top: 10rpx;">
+            <dk-text fontSize="24rpx" value="{{item.nonStdCode}}"></dk-text>
+          </view>
+          <view style="display: flex;justify-content: space-between;align-items: center;margin-top:10rpx;">
+            <!-- 仓库-->
+            <view>
+              <dk-text fontSize="24rpx" value="{{item.skuSpec}}"></dk-text>
+            </view>
+            <view>
+              <dk-text fontSize="24rpx" value="{{item.whName}}"></dk-text>
+            </view>
+          </view>
+          <view style="display: flex;justify-content: space-between;align-items: center;margin-top:5rpx;">
+            <!-- 系列 -->
+            <view wx:if="{{item.seriesName && item.seriesName !== ''}}">
+              <dk-text fontSize="24rpx" value="{{item.seriesName}}"></dk-text>
+            </view>
+          </view>
+        </view>
+      </view> 
+        <!--销售金额-->
+        <dk-cell contentColor="#1B365D" titleColor="#95A8CB;" title="销售金额"  content="1111111"></dk-cell>
+        <!--销售数量-->
+        <dk-cell contentColor="#1B365D" titleColor="#95A8CB;" title="销售数量" amount="{{false}}"content="1111111" ></dk-cell>  
+    </view>
 
     <!-- 内容 -->
     <view style="display: flex;flex-wrap: wrap;justify-content: center;" catchtap="toDetail" data-item="{{item}}" data-index="{{index}}">
@@ -89,8 +129,7 @@
                 <view class="item-info" wx:for="{{col.itemList}}" wx:for-item="listItem" data-item="{{listItem}}">
                   <view class="label">{{listItem.label}}</view>
                   <!-- <view class="number">{{item[listItem.code]?item[listItem.code]:0}}</view> -->
-                  <dk-cell left="0rpx" height="45rpx" contentRight="{{false}}" contentFontSize="13" contentColor="{{listItem.dataType === 'number'? '#A5814A': '#0000000'}}"
-                    contentFontWeight="bold" percentSignFlag="{{listItem.dataType === 'number'? false: true}}" content="{{item[listItem.code]?item[listItem.code]:0}}"></dk-cell>
+                  <dk-cell left="0rpx" height="45rpx" contentRight="{{false}}" contentFontSize="13" contentColor="{{listItem.dataType === 'number'? '#A5814A': '#0000000'}}" contentFontWeight="bold" percentSignFlag="{{listItem.dataType === 'number'? false: true}}" content="{{item[listItem.code]?item[listItem.code]:0}}"></dk-cell>
                 </view>
               </view>
             </view>

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

@@ -660,7 +660,7 @@ Page({
       element.amtStd = element.amtStd ? element.amtStd : 0
     });
     params.orderStatus = Constants.orderStatus.STATUS_DEAL //订单状态
-    params.outStatus = Constants.outStatus.unOutBound //出库状态
+    params.outStatus =  params.outStatus? params.outStatus:Constants.outStatus.unOutBound //出库状态
     params.makeStaff = app.globalData.user.staffId //制单人
     params.amtResidue = params.amtReceivable //剩余应收 = 应收金额 
     params.deleteItemList = params.deleteList ? params.deleteList : []

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

@@ -309,7 +309,13 @@ Page({
     this.setData({
       loading: true
     })
-    return this.excute(this.data.service, this.data.service.invalid + '/' + e.orderId, {}).then(res => {
+    let invalid = null
+    if (this.data.gradeCode == Constants.gradeCode.STD) {
+      invalid = this.data.service.oneKeyInvalid //一键作废
+    } else {
+      invalid = this.data.service.invalid
+    }
+    return this.excute(this.data.service, invalid + '/' + e.orderId, {}).then(res => {
       if (res.data.code == Constants.SUCESS_CODE) {
         wx.showToast({
           title: mixins.$t('invalidSuccessfully'),

package-sales/pages/order-sum-report/order-sum-report.js

@@ -61,7 +61,49 @@ Page({
     ],
     tagList: [
       { title: mixins.$t("goods"), code: mixins.$t("goods") }, 
-      { title: mixins.$t("customer"), code: mixins.$t("customer") }]
+      { title: mixins.$t("customer"), code: mixins.$t("customer") }],
+      tableData:[  {
+        "brandName": "冠珠GUANZHU",
+        "currentIntoAmt": 0,
+        "currentIntoQty": 0,
+        "currentOutAmt": 0,
+        "currentOutQty": 0,
+        "decimalPlaces": 0,
+        "endingIvtAmt": 99,
+        "endingIvtQty": 99,
+        "invId": "10112024-0624-0000-0000-00045b3b9096",
+        "nonStdCode": "WW",
+        "openingIvtAmt": 99,
+        "openingIvtQty": 99,
+        "packBox": 1,
+        "shortName": "冠珠GUANZHU",
+        "skuModel": "WAGYJ",
+        "skuName": "WANGYJ",
+        "skuSpec": "1",
+        "unitName": "套",
+        "whName": "主仓"
+      },
+      {
+        "brandName": "冠珠GUANZHU",
+        "currentIntoAmt": 0,
+        "currentIntoQty": 0,
+        "currentOutAmt": 0,
+        "currentOutQty": 0,
+        "decimalPlaces": 0,
+        "endingIvtAmt": 33,
+        "endingIvtQty": 1,
+        "invId": "10112024-0624-0000-0000-00045b53e1fc",
+        "nonStdCode": "-",
+        "openingIvtAmt": 33,
+        "openingIvtQty": 1,
+        "packBox": 1,
+        "shortName": "冠珠GUANZHU",
+        "skuModel": "WAGYJ",
+        "skuName": "WANGYJ",
+        "skuSpec": "1",
+        "unitName": "套",
+        "whName": "主仓"
+      },]
   },
 
   /**

package-sales/pages/order-sum-report/order-sum-report.wxml

@@ -14,10 +14,10 @@
 <view class="item-card">
   <view class="card-title">
     <view style="flex: 1;">
-      <view class="title"> 11111</view>
+      <view class="title"> 销售金额</view>
     </view>
     <view style="flex: 1;">
-      <view class="title"> 3333</view>
+      <view class="title"> 销售数量</view>
     </view>
   </view>
   <view class="card-content">
@@ -25,8 +25,10 @@
         <dk-cell left="0rpx" height="45rpx"   contentFontSize="14" contentColor="#A5814A" contentFontWeight="bold" content="1111" center="center"></dk-cell> 
     </view>
     <view style="flex: 1;"> 
-        <dk-cell left="0rpx" height="45rpx"   contentFontSize="14" contentColor="#A5814A" contentFontWeight="bold" content="22222"  center="center"></dk-cell> 
+        <dk-cell left="0rpx" height="45rpx"   contentFontSize="14" contentColor="#1B365D" contentFontWeight="bold" content="22222"  center=" center"amount="{{false}}"></dk-cell> 
     </view>
   </view>
 </view>
-</view>
+</view> 
+<!-- 列表区 -->
+<dk-list-report list="{{tableData}}" flgSubFormatDate="{{true}}"  titleTagCol="shortName"  titleCol="skuModel" iconCol="imagesUrl" descCol="skuName" title="skuCode" colorLeft="#437FF8" colorRight="#F43636" statusLeft="outStatusName" reportNameKey="salesum" contentCardTwoFlg="{{true}}" content="{{contentList}}" contentObj="{{contentObj}}" bind:toDetail="toDetail" bind:toTitle="toTitle"  routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list-report>