出货面板

salesPanel/panel/detail.js

@@ -15,7 +15,7 @@ Page({
                 "username": "周佳友",
                 "type": 0,
                 "dateType": "本年",
-                "datatype": 1,
+                "datatype": 2,
                 "typeName": "订单"
             }, {
                 "pageNumber": 1,
@@ -61,6 +61,7 @@ Page({
                     v.writeoffamount = CNY(v.writeoffamount)
                     v.returnamount = CNY(v.returnamount)
                     v.price = CNY(v.price)
+                    v.logisticsamount = CNY(v.logisticsamount)
                     v.expanded = false;
                     return v
                 })

salesPanel/panel/detail.wxml

@@ -6,27 +6,28 @@
                 <text class="tag" style="background-color: #67C23A;">{{language[item.tradefield]||item.tradefield}}</text>
                 {{item.sonum}}
             </view>
-            <view class="row">erp{{language['订单号']||'订单号'}}：{{item.erpbillno ||' --'}}</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" wx:if="{{item.expanded}}">{{language['行号']||'行号'}}：{{item.rowno ||' --'}}</view>
             <view class="row">{{language['产品名称']||'产品名称'}}：{{item.itemname ||' --'}}</view>
             <view class="row">{{language['产品编号']||'产品编号'}}：{{item.itemno ||' --'}}</view>
-            <view class="row">
+            <view class="row" wx:if="{{item.expanded}}">
                 {{language['型号']||'型号'}}：{{language[item.model]||item.model||' --'}}
             </view>
-            <view class="row" wx:if="{{siteid!='HY'}}">
+            <view class="row" wx:if="{{siteid!='HY' && item.expanded}}">
                 {{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}
             </view>
-            <view class="row" wx:if="{{siteid=='HY'}}">
+            <view class="row" wx:if="{{siteid=='HY' && item.expanded}}">
                 {{language['公称通径']||'公称通径'}}：{{item.caliber||' --'}}
             </view>
-            <view class="row" wx:if="{{siteid=='HY'}}">
+            <view class="row" wx:if="{{siteid=='HY' && item.expanded}}">
                 {{language['公称压力']||'公称压力'}}：{{item.nominalpressureStr||' --'}}
             </view>
-            <view class="row">{{language['需求日期']||'需求日期'}}：{{item.needdate||' --'}}</view>
-            <view class="row">{{language['回复交期']||'回复交期'}}：{{item.deliverydate||' --'}}</view>
+            <view class="row" wx:if="{{item.expanded}}">{{language['需求日期']||'需求日期'}}：{{item.needdate||' --'}}</view>
+            <view class="row" wx:if="{{item.expanded}}">{{language['回复交期']||'回复交期'}}：{{item.deliverydate||' --'}}</view>
             <view class="row">{{language['数量']||'数量'}}：{{item.qty||' --'}}</view>
             <view class="row">{{language['牌价']||'牌价'}}：<text style="color: #3874F6;">{{item.marketprice||' --'}}</text></view>
             <view class="row">{{language['订单单价']||'订单单价'}}：<text style="color: #3874F6;">{{item.price||' --'}}</text></view>
@@ -57,7 +58,6 @@
                         {{language['备注']||'备注'}}：{{language[item.specalnote]||item.specalnote||' --'}}
                     </view>
                 </block>
-                <view class="row">{{language['审核时间']||'审核时间'}}：{{item.checkdate||' --'}}</view>
             </view>
             <view class="{{item.expanded?'expanded up':'expanded'}}" data-index="{{index}}" bind:tap="changeExpanded">
                 {{item.expanded?'简略信息':'详情信息'}}
@@ -65,4 +65,50 @@
             </view>
         </view>
     </block>
+
+    <block wx:elif="{{content.datatype == 2}}">
+        <view class="global-card" wx:for="{{list}}" wx:key="sa_orderitemsid">
+            <view class="title">
+                <text class="tag" style="background-color: #3874F6;">{{language[item.type]||item.type}}</text>
+                <text class="tag" style="background-color: #67C23A;">{{language[item.tradefield]||item.tradefield}}</text>
+                {{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" wx:if="{{item.expanded}}">{{language['行号']||'行号'}}：{{item.rowno ||' --'}}</view>
+            <view class="row">{{language['产品名称']||'产品名称'}}：{{item.itemname ||' --'}}</view>
+            <view class="row">{{language['产品编号']||'产品编号'}}：{{item.itemno ||' --'}}</view>
+            <view class="row" wx:if="{{item.expanded}}">
+                {{language['型号']||'型号'}}：{{language[item.model]||item.model||' --'}}
+            </view>
+            <view class="row" wx:if="{{siteid!='HY' && item.expanded}}">
+                {{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}
+            </view>
+            <view class="row" wx:if="{{siteid=='HY' && item.expanded}}">
+                {{language['公称通径']||'公称通径'}}：{{item.caliber||' --'}}
+            </view>
+            <view class="row" wx:if="{{siteid=='HY' && item.expanded}}">
+                {{language['公称压力']||'公称压力'}}：{{item.nominalpressureStr||' --'}}
+            </view>
+            <view class="row" wx:if="{{item.expanded}}">{{language['需求日期']||'需求日期'}}：{{item.needdate||' --'}}</view>
+            <view class="row" wx:if="{{item.expanded}}">{{language['回复交期']||'回复交期'}}：{{item.deliverydate||' --'}}</view>
+            <view class="row">{{language['数量']||'数量'}}：{{item.qty||' --'}}</view>
+            <view class="row" wx:if="{{item.expanded}}">{{language['牌价']||'牌价'}}：<text style="color: #3874F6;">{{item.marketprice||' --'}}</text></view>
+            <view class="row" wx:if="{{item.expanded}}">{{language['订单单价']||'订单单价'}}：<text style="color: #3874F6;">{{item.price||' --'}}</text></view>
+            <view class="row">{{language['订单金额']||'订单金额'}}：<text style="color: #3874F6;">{{item.amount||' --'}}</text></view>
+            <view class="row">
+                {{language['出货数量']||'出货数量'}}：<text style="color: #3874F6;">{{item.logisticsqty||' --'}}</text>
+            </view>
+            <view class="row">
+                {{language['出货金额']||'出货金额'}}：<text style="color: #3874F6;">{{item.logisticsamount||' --'}}</text>
+            </view>
+            <view class="row" wx:if="{{item.expanded}}">{{language['审核时间']||'审核时间'}}：{{item.checkdate||' --'}}</view>
+            <view class="{{item.expanded?'expanded up':'expanded'}}" data-index="{{index}}" bind:tap="changeExpanded">
+                {{item.expanded?'简略信息':'详情信息'}}
+                <text class="iconfont icon-dianjizhankai" />
+            </view>
+        </view>
+    </block>
 </Yl_ListBox>