暂存

app.json

@@ -186,7 +186,8 @@
         {
             "root": "salesPanel",
             "pages": [
-                "index/index"
+                "index/index",
+                "panel/detail"
             ]
         }
     ],

project.private.config.json

@@ -9,12 +9,19 @@
         "miniprogram": {
             "list": [
                 {
-                    "name": "salesPanel/index/index",
-                    "pathName": "salesPanel/index/index",
+                    "name": "salesPanel/panel/detail",
+                    "pathName": "salesPanel/panel/detail",
                     "query": "",
                     "scene": null,
                     "launchMode": "default"
                 },
+                {
+                    "name": "salesPanel/index/index",
+                    "pathName": "salesPanel/index/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
                 {
                     "name": "/portrayal/index/index",
                     "pathName": "/portrayal/index/index",

salesPanel/index/index.js

@@ -24,13 +24,12 @@ Page({
         tabsActive: 0,
         showFiltrate: false,
         dataid: wx.getStorageSync('userMsg').userid,
+        username: wx.getStorageSync('userMsg').name,
         type: 0,
     },
     onLoad(options) {
         getApp().globalData.Language.getLanguagePackage(this, '销售数据');
-        this.selectComponent("#organization").initDepAndUser().then(res => {
-            console.log(res)
-        });
+        this.selectComponent("#organization").initDepAndUser()
         this.partialRenewal();
     }, //tabs 切换
     tabsChange({
@@ -72,7 +71,8 @@ Page({
             this.selectComponent("#organization").initDepAndUser()
             this.setData({
                 dataid: wx.getStorageSync('userMsg').userid,
-                'type': 0
+                'type': 0,
+                username: wx.getStorageSync('userMsg').name
             })
         } else {
             let active = this.selectComponent("#organization").data.result;
@@ -81,6 +81,7 @@ Page({
             this.setData({
                 dataid,
                 type,
+                username: active.name
             })
         }
         this.partialRenewal(true)

salesPanel/panel/detail.js

@@ -0,0 +1,76 @@
+const _Http = getApp().globalData.http,
+    currency = require("../../utils/currency"),
+    CNY = (value, symbol = "", precision = 2) => currency(value, {
+        symbol,
+        precision
+    }).format();
+Page({
+    data: {
+
+    },
+    onLoad(options) {
+        console.log(options)
+        let content = Object.assign({
+                "dataid": 2839,
+                "username": "周佳友",
+                "type": 0,
+                "dateType": "本年",
+                "datatype": 1,
+                "typeName": "订单"
+            }, {
+                "pageNumber": 1,
+                "pageSize": 100,
+                "where": {
+                    "condition": "",
+                    "type": "",
+                    "tradefield": ""
+                }
+            }),
+            ids = {
+                "订单": 2025032613405702,
+                "出货": 2025032615330102,
+                "开票": 2025032616343302,
+                "回款": 2025032616352402,
+            };
+        this.setData({
+            content,
+            id: ids[content.typeName],
+            siteid: wx.getStorageSync('userMsg').siteid
+        })
+        /* {"classname":"sysmanage.develop.optiontype.optiontype","method":"optiontypeselect","content":{"pageNumber":1,"pageSize":1000,"typename":"ordertype","parameter":{}},"languagecode":"ZH","accesstoken":"f6f0fdf9f9fb2854b64c3c7c669c0338","systemappid":277} */
+        /* {"classname":"sysmanage.develop.optiontype.optiontype","method":"optiontypeselect","content":{"pageNumber":1,"pageSize":1000,"typename":"tradefield","parameter":{}},"languagecode":"ZH","accesstoken":"f6f0fdf9f9fb2854b64c3c7c669c0338","systemappid":277} */
+        this.getList()
+    },
+    getList(init = false) {
+        _Http.init(this.data.content, init).then(content => {
+            _Http.basic({
+                "id": this.data.id,
+                content
+            }).then(res => {
+                console.log(content.typeName + "明细列表", res)
+                this.selectComponent('#ListBox').automaticSetHei();
+                this.selectComponent('#ListBox').RefreshToComplete();
+                if (res.code != '1') return wx.showToast({
+                    title: res.data,
+                    icon: "none"
+                })
+
+                /* 
+                marketprice
+                amount
+                invoiceamount
+                writeoffamount
+                returnamount
+                price
+                */
+                this.setData({
+                    list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
+                    "content.pageNumber": res.pageNumber + 1,
+                    "content.pageSize": res.pageSize,
+                    "content.pageTotal": res.pageTotal,
+                    "total": res.total,
+                })
+            })
+        })
+    },
+})

salesPanel/panel/detail.json

@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "明细"
+}

salesPanel/panel/detail.scss

@@ -0,0 +1,15 @@
+.title {
+	line-height: 38rpx;
+	font-family: Microsoft YaHei, Microsoft YaHei;
+	font-weight: bold;
+	font-size: 28rpx;
+	color: #333333;
+}
+
+.row {
+	line-height: 32rpx;
+	font-family: Microsoft YaHei, Microsoft YaHei;
+	font-size: 24rpx;
+	color: #999999;
+	margin-top: 10rpx;
+}

salesPanel/panel/detail.wxml

@@ -0,0 +1,94 @@
+<Yl_ListBox id='ListBox' bind:getlist='getList'>
+    <block wx:if="{{content.datatype == 1}}">
+        <view class="global-card" wx:for="{{list}}" wx:key="sa_orderitemsid">
+            <view class="title">
+                {{item.sonum}}
+            </view>
+            <view class="row">
+                erp{{language['订单号']||'订单号'}}：{{item.erpbillno ||' --'}}
+            </view>
+            <view class="row">
+                {{language['企业名称']||'企业名称'}}：{{item.enterprisename ||' --'}}
+            </view>
+            <view class="row">
+                {{language['项目名称']||'项目名称'}}：{{item.projectname ||' --'}}
+            </view>
+            <view class="row">
+                {{language['业务员']||'业务员'}}：{{item.salername ||' --'}}
+            </view>
+            <view class="row">
+                {{language['行号']||'行号'}}：{{item.rowno ||' --'}}
+            </view>
+            <view class="row">
+                {{language['产品名称']||'产品名称'}}：{{item.itemname ||' --'}}
+            </view>
+            <view class="row">
+                {{language['产品编号']||'产品编号'}}：{{item.itemno ||' --'}}
+            </view>
+            <view class="row">
+                {{language['型号']||'型号'}}：{{language[item.model]||item.model||' --'}}
+            </view>
+            <view class="row" wx:if="{{siteid!='HY'}}">
+                {{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}
+            </view>
+            <view class="row" wx:if="{{siteid=='HY'}}">
+                {{language['公称通径']||'公称通径'}}：{{item.caliber||' --'}}
+            </view>
+            <view class="row" wx:if="{{siteid=='HY'}}">
+                {{language['公称压力']||'公称压力'}}：{{item.nominalpressureStr||' --'}}
+            </view>
+            <view class="row">
+                {{language['需求日期']||'需求日期'}}：{{item.needdate||' --'}}
+            </view>
+            <view class="row">
+                {{language['回复交期']||'回复交期'}}：{{item.deliverydate||' --'}}
+            </view>
+            <view class="row">
+                {{language['数量']||'数量'}}：{{item.qty||' --'}}
+            </view>
+            <view class="row">
+                {{language['牌价']||'牌价'}}：{{item.marketprice||' --'}}
+            </view>
+            <view class="row">
+                {{language['订单单价']||'订单单价'}}：{{item.price||' --'}}
+            </view>
+            <view class="row">
+                {{language['订单金额']||'订单金额'}}：{{item.amount||' --'}}
+            </view>
+            <view>
+                <view class="row">
+                    {{language['未出货数量']||'未出货数量'}}：{{item.unlogisticsqty||' --'}}
+                </view>
+                <view class="row">
+                    {{language['已开票金额']||'已开票金额'}}：{{item.invoiceamount||' --'}}
+                </view>
+                <view class="row">
+                    {{language['已核销金额']||'已核销金额'}}：{{item.writeoffamount||' --'}}
+                </view>
+                <view class="row">
+                    {{language['退货数量']||'退货数量'}}：{{item.returngty||' --'}}
+                </view>
+                <view class="row">
+                    {{language['退款金额']||'退款金额'}}：{{item.returnamount||' --'}}
+                </view>
+                <view class="row">
+                    {{language['材质']||'材质'}}：{{language[item.material]||item.material||' --'}}
+                </view>
+                <block wx:if="{{siteid=='HY'}}">
+                    <view class="row">
+                        {{language['产线']||'产线'}}：{{language[item.prodline]||item.prodline||' --'}}
+                    </view>
+                    <view class="row">
+                        {{language['装置']||'装置'}}：{{language[item.device]||item.device||' --'}}
+                    </view>
+                    <view class="row">
+                        {{language['备注']||'备注'}}：{{language[item.specalnote]||item.specalnote||' --'}}
+                    </view>
+                </block>
+                <view class="row">
+                    {{language['审核时间']||'审核时间'}}：{{item.checkdate||' --'}}
+                </view>
+            </view>
+        </view>
+    </block>
+</Yl_ListBox>

salesPanel/panel/index.js

@@ -63,6 +63,7 @@ Component({
         }],
         "content": {
             dataid: wx.getStorageSync('userMsg').userid,
+            username: wx.getStorageSync('userMsg').name,
             type: 0,
             "dateType": "本年",
             "datatype": 1
@@ -76,7 +77,8 @@ Component({
                 item = this.data.list[content.datatype - 1];
             const {
                 dataid,
-                type
+                type,
+                username
             } = getCurrentPages()[getCurrentPages().length - 1].data;
             if (content.dataid != dataid || content.type != type) {
                 init = true
@@ -102,6 +104,7 @@ Component({
             }
             content.dataid = dataid;
             content.type = type;
+            content.username = username;
             if (!init && item.init) return;
             _Http.basic({
                 "id": 20231009125304,
@@ -131,7 +134,6 @@ Component({
                 this.setHeight()
                 this.onCancel();
             })
-
         },
         setHeight() {
             getHeight("#head", this).then(height => {
@@ -227,7 +229,11 @@ Component({
             getApp().globalData.Language.modeBoxPrompts('①累计日标金额:到当前时间为止的累计的目标金额，不计算未经历时间的目标金额;②同比增长率:同比增长率是指本期和上一年同期相比较的增长率,计算公式为:同比增长率=(本期数-同期数):同期数x100%。③环比增长率:环比增长率是指本期和上期相比较的增长率,计算公式为:环比增长率 =(本期数-上期数)÷上期数 x100%。4日标达成率=实际金额:目标金额x100%')
         },
         toDetail() {
-            console.log("2131323312321312")
+            let content = this.data.content
+            content.typeName = this.data.list.find(v => v.datatype == content.datatype).type;
+            wx.navigateTo({
+                url: '/salesPanel/panel/detail?data=' + JSON.stringify(content),
+            })
         }
     }
 })

salesPanel/panel/index.wxml

@@ -3,7 +3,7 @@
     <swiper-item class='swiper-item' wx:for='{{list}}' item-id='{{item.datatype}}' wx:key="type">
         <Yl_ListBox id='ListBox{{item.datatype}}' bind:getlist='getList'>
             <view style="width: 100vw;">
-                <view class="global-card panel" bind:tap="toDetail">
+                <view class="global-card panel">
                     <view class="head">
                         <view class="item" catch:tap="openAction">{{language[item.type]||item.type}}<text class="iconfont icon-webxialaxuanxiangjiantou"></text></view>
                         <view class="item" catch:tap="openDateType" style="margin-left: 40rpx;">{{language[content.dateType]||content.dateType}}<text class="iconfont icon-webxialaxuanxiangjiantou"></text></view>
@@ -19,7 +19,7 @@
                             </view>
                         </view>
                     </view>
-                    <view class="card">
+                    <view class="card" bind:tap="toDetail">
                         <view class="title">{{language['实际金额']||'实际金额'}}</view>
                         <view class="price">
                             ￥<text style="font-size: 40rpx;">{{item.amount}}</text>
@@ -81,4 +81,4 @@
 </wxs>
 
 <van-action-sheet show="{{  actionShow }}" actions="{{ list }}" bind:select='onSelect' bind:cancel='onCancel' bind:click-overlay='onCancel' cancel-text="{{language['取消']||'取消'}}" />
-<van-action-sheet show="{{  detaShow }}" actions="{{ dates }}" bind:select='dateOnSelect' bind:cancel='onCancel' bind:click-overlay='onCancel' cancel-text="{{language['取消']||'取消'}}" />
+<van-action-sheet show="{{  detaShow }}" actions="{{ dates }}" bind:select='dateOnSelect' bind:cancel='onCancel' bind:click-overlay='onCancel' cancel-text="{{language['取消']||'取消'}}" />