于继渤 1 year ago
parent
commit
c835a053fc

+ 5 - 7
api/pages/mst/saleReport.js

@@ -12,15 +12,13 @@ module.exports = {
     // 前缀
     // 前缀
     prefix: 'mdm-server/mst/report/',
     prefix: 'mdm-server/mst/report/',
     //销售跟踪列表
     //销售跟踪列表
-    getSalesTrackingReport: 'sales_tracking_report', 
-    //采购跟踪列表
-    getPurTrackingReport: 'pur_tracking_report', 
-       //采购跟踪明细
-    getPurTrackingReportDetail: 'pur_tracking_report_detail', 
+    getSalesTrackingReport: 'sales_tracking_report',
+    //销售跟踪明细
+    getSalesTrackingReportDetail: 'sale_tracking_report_detail',
   },
   },
   routeUrl: {
   routeUrl: {
     saleReport: {
     saleReport: {
-      edit: {key: 'edit', url: '/package-sales/pages/sales-tracking-report/detail/detail'},
+      edit: { key: 'edit', url: '/package-sales/pages/sales-tracking-report/detail/detail' },
     }
     }
-  } 
+  }
 };
 };

+ 2 - 1
app.json

@@ -335,7 +335,8 @@
         "dk-multi-owner": "components/dkbase/dk-multi-owner/dk-multi-owner",
         "dk-multi-owner": "components/dkbase/dk-multi-owner/dk-multi-owner",
         "dk-collapse-item-more": "components/dkbase/dk-collapse-item-more/dk-collapse-item-more",
         "dk-collapse-item-more": "components/dkbase/dk-collapse-item-more/dk-collapse-item-more",
         "dk-drag": "components/dkbase/dk-drag/index",
         "dk-drag": "components/dkbase/dk-drag/index",
-        "dk-list-report": "components/dkbase/dk-list-report/dk-list-report"
+        "dk-list-report": "components/dkbase/dk-list-report/dk-list-report",
+        "dk-goos-list": "components/dkbase/dk-goos-list/dk-goos-list"
     },
     },
     "tabBar": {
     "tabBar": {
         "color": "#95A8CB",
         "color": "#95A8CB",

+ 0 - 0
components/dkbase/dk-goos-list/dk-goos-list.js


+ 0 - 0
components/dkbase/dk-goos-list/dk-goos-list.json


+ 0 - 0
components/dkbase/dk-goos-list/dk-goos-list.wxml


+ 0 - 0
components/dkbase/dk-goos-list/dk-goos-list.wxss


+ 2 - 0
package-sales/pages/sales-outbound/add/add.js

@@ -170,6 +170,7 @@ Page({
     params.goodsList.forEach(res => {
     params.goodsList.forEach(res => {
       res.outingAmt = res.outAmt
       res.outingAmt = res.outAmt
       res.outingQty = res.outQty
       res.outingQty = res.outQty
+      res.canNegativeFlag =false
       res.outAmt = null
       res.outAmt = null
       res.outQty = null
       res.outQty = null
     })
     })
@@ -180,6 +181,7 @@ Page({
     let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
     let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
     params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出库标识 
     params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出库标识 
     params.addressName = params.address.addressName
     params.addressName = params.address.addressName
+    params.canNegativeFlag =false
     params.outDate = utils.formatDayTime(new Date())
     params.outDate = utils.formatDayTime(new Date())
     delete params['goodsList']
     delete params['goodsList']
     delete params['orderItemResponseList']
     delete params['orderItemResponseList']

+ 32 - 55
package-sales/pages/sales-tracking-report/detail/detail.js

@@ -1,66 +1,43 @@
-// package-sales/pages/sales-tracking-report/detail/detail.js
+const mixins = require('@/mixins/index.js')
+const Constants = require('@/utils/Constants.js');
+const app = getApp()
 Page({
 Page({
-
+  mixins: [mixins],
     /**
     /**
      * 页面的初始数据
      * 页面的初始数据
      */
      */
     data: {
     data: {
-
-    },
-
+    // 路由
+    routeObjName: 'saleReport',
+    },
+  /**
+   * @desc : 查询
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  getData() {
+    return this.excute(this.data.service, this.data.service.getSalesTrackingReportDetail+'/'+ this.data.item.orderId, {}).then(res=>{
+      console.log(res)
+      if(res.data.code == 200 ){
+        let formData = JSON.parse(this.data.formData)
+        if(res.data.data && res.data.data.length > 0){
+          let saleList =  res.data.data.filter(item=>{
+            return item.type== '销售订单'
+          })
+          formData.goodsList = saleList
+        }
+        this.setData({
+          formData:JSON.stringify(formData)
+        })
+      }
+    })
+  },
     /**
     /**
      * 生命周期函数--监听页面加载
      * 生命周期函数--监听页面加载
      */
      */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
+    loadInit() {
+      console.log()
+      this.getData()
     },
     },
 
 
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
 })
 })

+ 74 - 2
package-sales/pages/sales-tracking-report/detail/detail.wxml

@@ -1,2 +1,74 @@
-<!--package-sales/pages/sales-tracking-report/detail/detail.wxml-->
-<text>package-sales/pages/sales-tracking-report/detail/detail.wxml</text>
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<view>
+
+  <view class="detail-top">
+    <image class="scan-image" fit="fill" src="{{imageUrl+'/detail_sale_order.png'}}"></image>
+    <view class="detail-top-sup" style="display: flex;">
+      <view style="width: 15%;">
+        <image class="scan-image-icon" fit="fill" src="{{imageUrl+'/order_billing_detail_01.png'}}"></image>
+      </view>
+
+      <view>
+        <view style="display: flex;">
+          <view>
+            {{item.cusName}}
+          </view>
+          <view style="padding-left: 20rpx;">
+            {{item.cusPhone}}
+          </view>
+        </view>
+
+
+
+        <view style="z-index: 2;padding-top: 20rpx;">
+          {{ wxmlUtil.addressToIndexOf(item.addressFull)}}
+        </view>
+        <view style="display: flex;padding-top: 20rpx;font-weight: 500;">
+          <view>
+            {{item.staffName}}
+          </view>
+          <view style="padding-left: 20rpx;">|</view>
+          <view style="padding-left: 20rpx;">
+            {{item.orgName}}
+          </view>
+        </view>
+        <view style="z-index: 10;padding-top: 40rpx;font-size: 24rpx;font-weight: 400;">
+          销售日期:{{ wxmlUtil.formatDate(item.makeTime)}}
+        </view>
+      </view>
+
+    </view>
+
+
+  </view>
+
+
+  <view style="display: flex;padding:10rpx;  margin: 10px 22rpx 10px 22rpx;margin-top: 10px;border-radius: 15rpx;">
+    <view style="background-color:#F4F9FF;width:25%;padding:10rpx;border-radius: 16rpx;">
+      <view style="font-size:13px;text-align: center;margin-top: 10rpx;">订单数量</view>
+      <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" car="" content="{{item.returnAmt}}"></dk-cell>
+    </view>
+    <view style="background-color:#F4F9FF;width: 25%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
+      <view style="font-size:13px;text-align: center;margin-top: 10rpx;">销售出库</view>
+      <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" car="" content="{{item.outAmt}}"></dk-cell>
+    </view>
+
+    <view style="background-color:#F4F9FF;width:25%;padding:10rpx;border-radius: 16rpx;">
+      <view style="font-size:13px;text-align: center;margin-top: 10rpx;">退货数量</view>
+      <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" car="" content="{{item.returnAmt}}"></dk-cell>
+    </view>
+    <view style="background-color:#F4F9FF;width: 25%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
+      <view style="font-size:13px;text-align: center;margin-top: 10rpx;">销售回库</view>
+      <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" car="" content="{{item.outAmt}}"></dk-cell>
+    </view>
+  </view>
+
+
+
+
+
+
+
+
+
+</view>

+ 84 - 1
package-sales/pages/sales-tracking-report/detail/detail.wxss

@@ -1 +1,84 @@
-/* package-sales/pages/sales-tracking-report/detail/detail.wxss */
+page {
+  background: #FFFFFF;
+}
+.detail-top {
+  position: relative;
+  border: 1px solid #F3FBFF;
+  margin: 10px 32rpx 10px 32rpx;
+  background-color: #FFFF;
+  background: radial-gradient(61.26% 65.52% at 6.12% 18.49%, #CDD8FF 0%, #F3FAFF 100%);
+  padding: 20rpx;
+  border-radius: 16rpx;
+}
+
+.dk-card-outer-class-1 {
+  margin: 10px 32rpx 10px 32rpx;
+  margin-top: 10px;
+  border-radius: 15rpx;
+  /* box-shadow: 2px 2px 5px #e5e5e6; */
+}
+
+.detail-top-sup {
+  color: #002340;
+  font-weight: bold;
+  font-size: 28rpx;
+  padding: 10rpx;
+}
+
+.detail-top-color {
+  font-weight: bold;
+  color: #002340;
+  font-size: 14px;
+  padding: 10rpx;
+}
+.scan-image-icon {
+  width: 40rpx;
+  height: 40rpx;
+}
+
+.scan-image-icon-3{
+  width: 96rpx;
+  height: 96rpx;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  border-radius: 0px 0px 16rpx 0px;
+}
+.scan-image {
+  width: 200rpx;
+  height: 200rpx;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  border-radius: 0px 0px 16rpx 0px;
+}
+.edit-image{
+  width: 50rpx;
+  height: 50rpx;
+  position: absolute;
+  right: 30rpx;
+  top: 20rpx;
+  border-radius: 0px 0px 16rpx 0px;
+}
+
+.tags-class{
+  margin: 20rpx;
+  /* text-align: center; */
+  display: flex;
+  justify-content: center;
+}
+.dk-card-outer-class-1 {
+  margin: 10px 32rpx 10px 32rpx;
+  margin-top: 10px;
+  border-radius: 15rpx;
+  /* box-shadow: 2px 2px 5px #e5e5e6; */
+}
+.btn-add-class {
+  background: #8091A9;
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 20rpx;
+  box-shadow: 0px 17px 22px 0px #1B365D33;
+}

+ 14 - 1
utils/wxmlUtil.wxs

@@ -62,6 +62,18 @@ var formatDateTime = function (time) {
   return year + '-' + month + '-' + day + ' ' + hour + ':' + minute
   return year + '-' + month + '-' + day + ' ' + hour + ':' + minute
 }
 }
 
 
+
+var formatDate = function (time) {
+  if (!time || time == '') {
+    return ''
+  }
+  var date = getDate(time);
+  var year = date.getFullYear()
+  var month = date.getMonth() + 1
+  var day = date.getDate()
+  return year + '-' + month + '-' + day 
+}
+
 /**
 /**
  * json
  * json
  * @param str 
  * @param str 
@@ -294,5 +306,6 @@ module.exports = {
   getType: getType,
   getType: getType,
   jsCalcFix2: jsCalcFix2,
   jsCalcFix2: jsCalcFix2,
   defineIndexOf: defineIndexOf,
   defineIndexOf: defineIndexOf,
-  formatDateTime: formatDateTime
+  formatDateTime: formatDateTime,
+  formatDate:formatDate
 } 
 }