优化

portrayal/client/ClientFollow.wxml

@@ -22,7 +22,6 @@
         <view class="line" wx:for="{{item.cons}}" wx:for-item='cons' wx:key='cons.label'>
             {{language[cons.label]||cons.label}}：{{language[cons.value]||cons.value}}
         </view>
-        <view class="line">{{language['跟进时间']||'跟进时间'}}：{{item.createdate||' --'}}</view>
     </view>
 </view>
 <My_empty wx:else />

portrayal/orderForm/client.js

@@ -85,6 +85,13 @@ Component({
                     v.allunAmount = CNY(v.allunAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.alluninvoicamount = CNY(v.alluninvoicamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.allunwriteoffamount = CNY(v.allunwriteoffamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
+                    v.joinOrderAmount = CNY(v.joinOrderAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000))
+                    v.amount = CNY(v.amount);
+                    v.unoutOrderamount = CNY(v.unoutOrderamount);
+                    v.uninvoicamount = CNY(v.uninvoicamount);
+                    v.unwriteoffamount = CNY(v.unwriteoffamount);
+                    v.writeoffamount = CNY(v.writeoffamount);
+                    v.returnamount = CNY(v.returnamount);
                     return v
                 })
                 this.setData({

portrayal/orderForm/client.wxml

@@ -54,7 +54,7 @@
                 <view class="line">
                     {{language['订单类型']||'订单类型'}}：{{language[item.type]||item.type || ' --'}}
                 </view>
-                <view class="line">{{language['订单金额']||'订单金额'}}：{{item.sumamount || ' --'}}</view>
+                <view class="line">{{language['订单金额']||'订单金额'}}：{{item.amount || ' --'}}</view>
                 <view class="line">
                     {{language['订单未出货金额']||'订单未出货金额'}}：{{item.unoutOrderamount || ' --'}}
                 </view>

portrayal/orderForm/contacts.js

@@ -83,6 +83,12 @@ Component({
                     v.allunAmount = CNY(v.allunAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.alluninvoicamount = CNY(v.alluninvoicamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.allunwriteoffamount = CNY(v.allunwriteoffamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
+                    v.amount = CNY(v.amount)
+                    v.writeoffamount = CNY(v.writeoffamount)
+                    v.returnamount = CNY(v.returnamount)
+                    v.unoutOrderamount = CNY(v.unoutOrderamount)
+                    v.uninvoicamount = CNY(v.uninvoicamount)
+                    v.unwriteoffamount = CNY(v.unwriteoffamount)
                     return v
                 })
                 this.setData({

portrayal/orderForm/contacts.wxml

@@ -48,7 +48,7 @@
                     {{language['客户名称']||'客户名称'}}：{{item.enterprisename || ' --'}}
                 </view>
                 <view class="line">{{language['项目名称']||'项目名称'}}：{{item.projectname || ' --'}}</view>
-                <view class="line">{{language['订单金额']||'订单金额'}}：{{item.sumamount || ' --'}}</view>
+                <view class="line">{{language['订单金额']||'订单金额'}}：{{item.amount || ' --'}}</view>
                 <view class="line">
                     {{language['订单回款金额']||'订单回款金额'}}：{{item.writeoffamount || ' --'}}
                 </view>

portrayal/orderForm/project.js

@@ -63,6 +63,12 @@ Component({
                     v.allunAmount = CNY(v.allunAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.alluninvoicamount = CNY(v.alluninvoicamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.allunwriteoffamount = CNY(v.allunwriteoffamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
+                    v.amount = CNY(v.amount)
+                    v.writeoffamount = CNY(v.writeoffamount)
+                    v.returnamount = CNY(v.returnamount)
+                    v.unoutOrderamount = CNY(v.unoutOrderamount)
+                    v.uninvoicamount = CNY(v.uninvoicamount)
+                    v.unwriteoffamount = CNY(v.unwriteoffamount)
                     return v
                 })
                 this.setData({

portrayal/orderForm/project.wxml

@@ -43,7 +43,7 @@
                 <view class="line">
                     {{language['订单类型']||'订单类型'}}：{{language[item.type]||item.type || ' --'}}
                 </view>
-                <view class="line">{{language['订单金额']||'订单金额'}}：{{item.sumamount || ' --'}}</view>
+                <view class="line">{{language['订单金额']||'订单金额'}}：{{item.amount || ' --'}}</view>
                 <view class="line">
                     {{language['订单回款金额']||'订单回款金额'}}：{{item.writeoffamount || ' --'}}
                 </view>

portrayal/orderForm/sales.js

@@ -84,6 +84,12 @@ Component({
                     v.allunAmount = CNY(v.allunAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.alluninvoicamount = CNY(v.alluninvoicamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.allunwriteoffamount = CNY(v.allunwriteoffamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
+                    v.amount = CNY(v.amount)
+                    v.writeoffamount = CNY(v.writeoffamount)
+                    v.returnamount = CNY(v.returnamount)
+                    v.unoutOrderamount = CNY(v.unoutOrderamount)
+                    v.uninvoicamount = CNY(v.uninvoicamount)
+                    v.unwriteoffamount = CNY(v.unwriteoffamount)
                     return v
                 })
                 this.setData({

portrayal/orderForm/sales.wxml

@@ -48,7 +48,7 @@
                     {{language['客户名称']||'客户名称'}}：{{item.enterprisename || ' --'}}
                 </view>
                 <view class="line">{{language['项目名称']||'项目名称'}}：{{item.projectname || ' --'}}</view>
-                <view class="line">{{language['订单金额']||'订单金额'}}：{{item.sumamount || ' --'}}</view>
+                <view class="line">{{language['订单金额']||'订单金额'}}：{{item.amount || ' --'}}</view>
                 <view class="line">
                     {{language['订单回款金额']||'订单回款金额'}}：{{item.writeoffamount || ' --'}}
                 </view>

portrayal/priceSheet/index.js

@@ -124,7 +124,7 @@ Component({
                     v.topQuotedpriceamount = CNY((v.quotedpriceamount || 0) / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.quotedpriceamount = CNY(v.quotedpriceamount);
                     v.begdate = v.begdate.split(" ")[0]
-                    v.begdate = v.enddate.split(" ")[0]
+                    v.enddate = v.enddate.split(" ")[0]
                     try {
                         v.discountrate = (v.discountrate * 100).toFixed(2) + '%'
                     } catch (error) {
@@ -225,7 +225,7 @@ Component({
                         v.topQuotedpriceamount = CNY((v.quotedpriceamount || 0) / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                         v.quotedpriceamount = CNY(v.quotedpriceamount);
                         v.begdate = v.begdate.split(" ")[0]
-                        v.begdate = v.enddate.split(" ")[0]
+                        v.enddate = v.enddate.split(" ")[0]
                         try {
                             v.discountrate = (v.discountrate * 100).toFixed(2) + '%'
                         } catch (error) {

portrayal/project/ProjectFollow.wxml

@@ -22,7 +22,6 @@
         <view class="line" wx:for="{{item.cons}}" wx:for-item='cons' wx:key='cons.label'>
             {{language[cons.label]||cons.label}}：{{language[cons.value]||cons.value}}
         </view>
-        <view class="line">{{language['跟进时间']||'跟进时间'}}：{{item.createdate||' --'}}</view>
     </view>
 </view>
 <My_empty wx:else />