界面优化

packageA/contract/modules/type.wxs

@@ -15,7 +15,7 @@ module.exports = {
                 result = '居间协议'
                 break;
             default:
-                result = '--'
+                result = type + '协议'
                 break;
         };
         return result;

portrayal/clue/salesFollow.wxml

@@ -23,7 +23,6 @@
             {{language['项目']||'项目'}}：{{language[item.projectname]||item.projectname||' --'}}
         </view>
         <view class="line">{{language['跟进内容']||'跟进内容'}}：{{item.content||' --'}}</view>
-        <view class="line">{{language['跟进时间']||'跟进时间'}}：{{item.createdate||' --'}}</view>
     </view>
 </view>
 <My_empty wx:else />

portrayal/clue/salesList.wxml

@@ -3,11 +3,11 @@
     <view class="global-card" style='margin-top:0;'>
         <view class="row">
             <view class="col" style='background-color: #3874F6;'>
-                <view class="label">{{language['客户数']||'客户数'}}</view>
+                <view class="label">{{language['线索数']||'线索数'}}</view>
                 <view class="value">{{list[0].orderclueSize || 0}}</view>
             </view>
             <view class="col" style='background-color: #68C23A'>
-                <view class="label">{{language['新增客户数']||'新增客户数'}}</view>
+                <view class="label">{{language['新增线索数']||'新增线索数'}}</view>
                 <view class="value">{{list[0].insertOrderclue|| 0}}</view>
             </view>
         </view>

portrayal/contract/client.js

@@ -121,6 +121,25 @@ Component({
                 content.pageTotal = res.pageTotal;
                 content.total = res.total;
                 res.data = res.data.map(v => {
+                    let result = "";
+                    switch (v.type) {
+                        case "框架":
+                            result = '经销商合作协议'
+                            break;
+                        case "直销":
+                            result = '直销客户合作协议'
+                            break;
+                        case "工具借用":
+                            result = '工具使用(借用)协议'
+                            break;
+                        case "居间":
+                            result = '居间协议'
+                            break;
+                        default:
+                            result = v.type + '协议'
+                            break;
+                    };
+                    v.type = result
                     v.sumSignAmount = CNY(v.sumSignAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.inProgressAmount = CNY(v.inProgressAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.expireAmount = CNY(v.expireAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));

portrayal/contract/client.wxml

@@ -33,11 +33,11 @@
     </view>
     <view class="row">
         <view class="col" style='background-color: #E6A33B;'>
-            <view class="label">{{language['转让合同总数']||'转让合同总数'}}</view>
+            <view class="label">{{language['转订单合同数']||'转订单合同数'}}</view>
             <view class="value">{{list[0].convertOrderContractQty}}</view>
         </view>
         <view class="col" style='background-color: #F56C6D'>
-            <view class="label">{{language['转让合同金额']||'转让合同金额'}}</view>
+            <view class="label">{{language['转订单合同金额']||'转订单合同金额'}}</view>
             <view class="value">{{list[0].convertOrderContractAmount}}{{language['万']||'万'}}</view>
         </view>
     </view>
@@ -51,7 +51,7 @@
             </view>
             <view class="line">{{language['合同标题']||'合同标题'}}：{{item.title || ' --'}}</view>
             <view class="line">
-                {{language['合同类型']||'合同类型'}}：{{language[item.type]||item.type || ' --'}}
+                {{language['合同类型']||'合同类型'}}：{{language[item.type]||item.type}}
             </view>
             <view class="line">{{language['合同金额']||'合同金额'}}：{{item.signAmount || '0'}}</view>
             <view class="line">{{language['综合折扣']||'综合折扣'}}：{{item.avgdiscountrate || ' --'}}</view>

portrayal/modules/competitor.wxml

@@ -1,10 +1,12 @@
-<navigator url="/packageA/opponent/detail?id={{item.sa_competitorid}}" class="global-card serve-item" wx:for='{{list}}' wx:key='sa_competitorid'>
-    <view class="title">{{item.enterprisename || '--'}}</view>
-    <view class="line">
-        {{language['品牌']||'品牌'}}：{{language[item.brandname]||item.brandname|| ' --'}}
-    </view>
-    <view class="line">
-        {{language['是否主要威胁']||'是否主要威胁'}}：{{language[item.important?'是':'否']||item.important?'是':'否'}}
-    </view>
-</navigator>
-<My_empty wx:if='{{!list.length}}' />
+<My_empty wx:if='{{list[0].isEmpty}}' />
+<block wx:else>
+    <navigator url="/packageA/opponent/detail?id={{item.sa_competitorid}}" class="global-card serve-item" wx:for='{{list}}' wx:key='sa_competitorid'>
+        <view class="title">{{item.enterprisename || '--'}}</view>
+        <view class="line">
+            {{language['品牌']||'品牌'}}：{{language[item.brandname]||item.brandname|| ' --'}}
+        </view>
+        <view class="line">
+            {{language['是否主要威胁']||'是否主要威胁'}}：{{language[item.important?'是':'否']||item.important?'是':'否'}}
+        </view>
+    </navigator>
+</block>

portrayal/modules/product.wxml

@@ -1,4 +1,3 @@
-<timeRange id='TimeRange' dateTypes='{{dateTypes}}' dateType='{{dateType}}' bind:onChange='changeDate' />
 <block>
     <view class="global-card" style='margin-top:0;'>
         <view class="row" style='margin-bottom:0;'>

portrayal/modules/projectAssessment.js

@@ -55,10 +55,6 @@ Component({
                 content.pageSize = res.pageSize;
                 content.pageTotal = res.pageTotal;
                 content.total = res.total;
-                res.data = res.data.map(v => {
-                    v.names = v.parties.map(item => item.enterprisename)
-                    return v
-                })
                 this.setData({
                     list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
                     content,

portrayal/modules/projectAssessment.scss

@@ -1 +1,25 @@
-@import "../project/client.scss"
+@import "../project/client.scss";
+
+.partie {
+	margin-top: 10rpx;
+
+	.title {
+		display: flex;
+		line-height: 40rpx;
+		font-family: Microsoft YaHei, Microsoft YaHei;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #333333;
+
+		.tag {
+			height: 40rpx;
+			line-height: 40rpx;
+			padding: 0 10rpx;
+			background: #F29C37;
+			border-radius: 8rpx;
+			margin-right: 10rpx;
+			font-size: 20rpx;
+			color: #FFFFFF;
+		}
+	}
+}

portrayal/modules/projectAssessment.wxml

@@ -21,15 +21,14 @@
     <view style='padding-top: 20rpx;'>
         <view class="global-card serve-item" wx:for='{{list}}' wx:key='sa_project_taskid'>
             <view class="title">{{item.taskname}}</view>
-            <view class="line">{{language['评估对象']||'评估对象'}}：{{item.names || ' --'}}</view>
-            <view class="line" style='display: flex;'>
-                {{language['评估结果']||'评估结果'}}：
-                <view wx:for='{{item.parties}}' wx:key='optionname' wx:for-item='it' wx:for-index='i'>
-                    {{language[it.optionname]||it.optionname}}
-                    <text wx:if='{{i==item.parties.length}}'>,</text>
+            <view class="line">{{language['评估说明']||'评估说明'}}：{{item.actionnotes || ' --'}}</view>
+      
+            <view wx:for='{{item.parties}}' wx:key='optionname' wx:for-item='it' wx:for-index='i' class="partie">
+                <view class="title" wx:if="{{it.enterprisename}}">
+                    <view class="tag">{{language[it.type]||it.type}}</view>{{it.enterprisename||' --'}}
                 </view>
+                <view class="line"> {{language['评估结果']||'评估结果'}}：{{language[it.optionname]||it.optionname}}</view>
             </view>
-            <view class="line">{{language['评估说明']||'评估说明'}}：{{item.actionnotes || ' --'}}</view>
         </view>
     </view>
 </shrink>

portrayal/orderForm/client.js

@@ -80,17 +80,11 @@ Component({
                 content.pageTotal = res.pageTotal;
                 content.total = res.total;
                 res.data = res.data.map(v => {
-                    v.allunAmount = CNY(v.allunAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.joinOrderAmount = CNY(v.joinOrderAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.sumamount = CNY(v.sumamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.allAmount = CNY(v.allAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.cashbillAmount = CNY(v.cashbillAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
+                    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.unoutOrderamount = CNY(v.unoutOrderamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.uninvoicamount = CNY(v.uninvoicamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.writeoffamount = CNY(v.writeoffamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.returnamount = CNY(v.returnamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     return v
                 })
                 this.setData({

portrayal/orderForm/contacts.js

@@ -78,18 +78,11 @@ Component({
                 content.pageTotal = res.pageTotal;
                 content.total = res.total;
                 res.data = res.data.map(v => {
-                    v.allunAmount = CNY(v.allunAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.joinOrderAmount = CNY(v.joinOrderAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.sumamount = CNY(v.sumamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.allAmount = CNY(v.allAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.cashbillAmount = CNY(v.cashbillAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
+                    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.unwriteoffamount = CNY(v.unwriteoffamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.unoutOrderamount = CNY(v.unoutOrderamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.uninvoicamount = CNY(v.uninvoicamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.writeoffamount = CNY(v.writeoffamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.returnamount = CNY(v.returnamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     return v
                 })
                 this.setData({

portrayal/orderForm/project.js

@@ -58,18 +58,11 @@ Component({
                 content.pageTotal = res.pageTotal;
                 content.total = res.total;
                 res.data = res.data.map(v => {
-                    v.allunAmount = CNY(v.allunAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.joinOrderAmount = CNY(v.joinOrderAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.sumamount = CNY(v.sumamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.allAmount = CNY(v.allAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.cashbillAmount = CNY(v.cashbillAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
+                    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.unwriteoffamount = CNY(v.unwriteoffamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.unoutOrderamount = CNY(v.unoutOrderamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.uninvoicamount = CNY(v.uninvoicamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.writeoffamount = CNY(v.writeoffamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.returnamount = CNY(v.returnamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     return v
                 })
                 this.setData({

portrayal/orderForm/sales.js

@@ -79,18 +79,11 @@ Component({
                 content.pageTotal = res.pageTotal;
                 content.total = res.total;
                 res.data = res.data.map(v => {
-                    v.allunAmount = CNY(v.allunAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.joinOrderAmount = CNY(v.joinOrderAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.sumamount = CNY(v.sumamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.allAmount = CNY(v.allAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     v.cashbillAmount = CNY(v.cashbillAmount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
+                    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.unwriteoffamount = CNY(v.unwriteoffamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.unoutOrderamount = CNY(v.unoutOrderamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.uninvoicamount = CNY(v.uninvoicamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.writeoffamount = CNY(v.writeoffamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
-                    v.returnamount = CNY(v.returnamount / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000));
                     return v
                 })
                 this.setData({

portrayal/priceSheet/index.js

@@ -123,6 +123,8 @@ Component({
                 res.data = res.data.map(v => {
                     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]
                     try {
                         v.discountrate = (v.discountrate * 100).toFixed(2) + '%'
                     } catch (error) {
@@ -222,6 +224,8 @@ Component({
                     res.data = res.data.map(v => {
                         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]
                         try {
                             v.discountrate = (v.discountrate * 100).toFixed(2) + '%'
                         } catch (error) {

portrayal/priceSheet/index.wxml

@@ -37,7 +37,7 @@
                 {{language['综合折扣']||'综合折扣'}}：{{item.avgdiscountrate||item.discountrate || ' --'}}
             </view>
             <view class="line">
-                {{language['特价']||'特价'}}：{{language[item.specialoffer==1?'是':'否']||item.specialoffer==1?'是':'否' || ' --'}}
+                {{language['特价']||'特价'}}：<text style="color:{{sColors[item.specialoffer==1?'是':'否']||'999999'}}">{{language[item.specialoffer==1?'是':'否']||item.specialoffer==1?'是':'否' || ' --'}}</text>
             </view>
             <view class="line">
                 {{language['报价日期']||'报价日期'}}：{{item.submitdate||item.billdate || ' --'}}

project.private.config.json

@@ -9,12 +9,26 @@
     "condition": {
         "miniprogram": {
             "list": [
+                {
+                    "name": "portrayal/details/project",
+                    "pathName": "portrayal/details/project",
+                    "query": "id=8286",
+                    "scene": null,
+                    "launchMode": "default"
+                },
+                {
+                    "name": "portrayal/details/client",
+                    "pathName": "portrayal/details/client",
+                    "query": "id=1400",
+                    "launchMode": "default",
+                    "scene": null
+                },
                 {
                     "name": "portrayal/index/index",
                     "pathName": "portrayal/index/index",
                     "query": "",
-                    "scene": null,
-                    "launchMode": "default"
+                    "launchMode": "default",
+                    "scene": null
                 },
                 {
                     "name": "portrayal/details/client",