万改万元

packageA/contract/detail.js

@@ -265,6 +265,10 @@ Page({
                 label: "签约金额(元)",
                 value: CNY(data.signamount)
             })
+            briefs.splice(7, 0, {
+                label: "折扣(%)",
+                value: data.discountrate * 100 + "%"
+            })
             list1.splice(3, 0, {
                 label: data.typemx == '直销' ? '客户' : "经销商",
                 value: data.enterprisename
@@ -306,6 +310,10 @@ Page({
                 label: "签约金额",
                 value: CNY(data.signamount)
             })
+            list1.splice(13, 0, {
+                label: "折扣(%)",
+                value: data.discountrate * 100 + "%"
+            })
             if (data.typemx == '直销') briefs[2].label = '客户';
         } else {
             switch (data.type) {
@@ -318,7 +326,11 @@ Page({
                         label: "项目",
                         value: data.projectname
                     })
-                    briefs.splice(4, 1, {
+                    briefs.splice(4, 0, {
+                        label: "项目编号",
+                        value: data.projectnum
+                    })
+                    briefs.splice(5, 1, {
                         label: data.calculatemodel == 1 ? '订单金额比例' : '产品折扣',
                         value: data.calculatemodel == 1 ? data.orderratio * 100 + '%' : data.productdiscount * 100 + '%'
                     })
@@ -342,7 +354,11 @@ Page({
                         label: "项目",
                         value: data.projectname
                     })
-                    list1.splice(7, 0, {
+                    list1.splice(6, 0, {
+                        label: "项目编号",
+                        value: data.projectnum
+                    })
+                    list1.splice(8, 0, {
                         label: data.calculatemodel == 1 ? '订单金额比例' : '居间产品折扣',
                         value: data.calculatemodel == 1 ? data.orderratio * 100 + '%' : data.productdiscount * 100 + '%'
                     })
@@ -372,19 +388,27 @@ Page({
                     break;
                 case "经销商合作协议":
                     briefs[3].label = '折扣(%)';
+                    briefs.splice(3, 0, {
+                        label: "签约金额(元)",
+                        value: CNY(data.signamount)
+                    })
                     list1.splice(3, 0, {
                         label: "经销商",
                         value: data.enterprisename
                     })
                     list1.splice(4, 0, {
+                        label: "签约金额(元)",
+                        value: CNY(data.signamount)
+                    })
+                    list1.splice(5, 0, {
                         label: "折扣(%)",
                         value: data.discountrate * 100 + "%"
                     })
-                    list1.splice(5, 0, {
+                    list1.splice(6, 0, {
                         label: "品牌",
                         value: data.brandname
                     })
-                    list1.splice(6, 0, {
+                    list1.splice(7, 0, {
                         label: "领域",
                         value: data.tradefields
                     })

packageA/project/addAndEdit.js

@@ -74,7 +74,7 @@ Page({
                 checking: "base",
                 required: false
             }, {
-                label: "项目预算(万)",
+                label: "项目预算(万元)",
                 error: false,
                 errMsg: "",
                 type: "digit",
@@ -84,7 +84,7 @@ Page({
                 checking: "base",
                 required: false
             }, {
-                label: "总投资额(万)",
+                label: "总投资额(万元)",
                 error: false,
                 errMsg: "",
                 type: "digit",
@@ -94,7 +94,7 @@ Page({
                 checking: "base",
                 required: false
             }, {
-                label: "造价(万)",
+                label: "造价(万元)",
                 error: false,
                 errMsg: "",
                 type: "digit",

packageA/project/detail.js

@@ -177,15 +177,15 @@ Page({
                     label: "项目规模",
                     value: data.scale
                 }, {
-                    label: "项目预算(万)",
+                    label: "项目预算(万元)",
                     value: CNY(data.budgetary)
                 },
                 {
-                    label: "总投资额(万)",
+                    label: "总投资额(万元)",
                     value: CNY(data.totalinvestment)
                 },
                 {
-                    label: "造价(万)",
+                    label: "造价(万元)",
                     value: CNY(data.costofconstruction)
                 },
                 {

packageA/publicClue/addClue.js

@@ -76,7 +76,7 @@ Page({
             checking: "base",
             required: false
         }, {
-            label: "总投资额(万)",
+            label: "总投资额(万元)",
             error: false,
             errMsg: "",
             type: "digit",
@@ -86,7 +86,7 @@ Page({
             checking: "base",
             required: false
         }, {
-            label: "造价(万)",
+            label: "造价(万元)",
             error: false,
             errMsg: "",
             type: "digit",

packageA/publicClue/detail.js

@@ -109,10 +109,10 @@ Page({
                     label: "项目规模",
                     value: res.data.scale
                 }, {
-                    label: "总投资额(万)",
+                    label: "总投资额(万元)",
                     value: res.data.totalinvestment
                 }, {
-                    label: "造价(万)",
+                    label: "造价(万元)",
                     value: res.data.costofconstruction
                 }, {
                     label: "预计开工时间",

packageA/saleClue/addClue.js

@@ -76,7 +76,7 @@ Page({
                 checking: "base",
                 required: false
             }, {
-                label: "总投资额(万)",
+                label: "总投资额(万元)",
                 error: false,
                 errMsg: "",
                 type: "digit",
@@ -86,7 +86,7 @@ Page({
                 checking: "base",
                 required: false
             }, {
-                label: "造价(万)",
+                label: "造价(万元)",
                 error: false,
                 errMsg: "",
                 type: "digit",

packageA/saleClue/change.js

@@ -68,7 +68,7 @@ Page({
                 checking: "base",
                 required: false
             }, {
-                label: "项目预算(万)",
+                label: "项目预算(万元)",
                 error: false,
                 errMsg: "",
                 type: "digit",
@@ -78,7 +78,7 @@ Page({
                 checking: "base",
                 required: false
             }, {
-                label: "总投资额(万)",
+                label: "总投资额(万元)",
                 error: false,
                 errMsg: "",
                 type: "digit",
@@ -88,7 +88,7 @@ Page({
                 checking: "base",
                 required: false
             }, {
-                label: "造价(万)",
+                label: "造价(万元)",
                 error: false,
                 errMsg: "",
                 type: "digit",

packageA/saleClue/detail.js

@@ -143,10 +143,10 @@ Page({
                     label: "项目规模",
                     value: res.data.scale
                 }, {
-                    label: "总投资额(万)",
+                    label: "总投资额(万元)",
                     value: CNY(res.data.totalinvestment)
                 }, {
-                    label: "造价(万)",
+                    label: "造价(万元)",
                     value: CNY(res.data.costofconstruction)
                 }, {
                     label: "预计开工时间",