zhaoxiaohai 3 лет назад
Родитель
Сommit
3c7f99fa3a

+ 164 - 97
packageA/saleClue/addClue.js

@@ -5,103 +5,168 @@ Page({
     data: {
         showAll: false,
         form: [{
-            label: "客户(企业)",
-            error: false,
-            errMsg: "",
-            type: "label",
-            value: "",
-            placeholder: "客户(企业)",
-            valueName: "enterprisename",
-            checking: "base",
-            slot: "info",
-            required: false
-        }, {
-            label: "联系人",
-            error: false,
-            errMsg: "",
-            type: "label",
-            value: "",
-            placeholder: "联系人",
-            valueName: "name",
-            checking: "base",
-            required: false
-        }, {
-            label: "手机号码",
-            error: false,
-            checking: "phone",
-            errMsg: "",
-            type: "number",
-            value: "",
-            placeholder: "手机号码",
-            valueName: "phonenumber", //绑定的字段名称
-            required: true, //必填
-        }, {
-            label: "省市县",
-            error: false,
-            errMsg: "",
-            type: "region",
-            value: "",
-            placeholder: "省市县",
-            valueName: "region",
-            checking: "base",
-            required: false
-        }, {
-            label: "详细地址",
-            error: false,
-            errMsg: "",
-            type: "label",
-            value: "",
-            placeholder: "详细地址",
-            valueName: "address",
-            checking: "base",
-            required: false
-        }, {
-            label: "市场活动",
-            error: false,
-            errMsg: "",
-            type: "route",
-            url: "/packageA/select/selectActivity/index",
-            model: "#Form",
-            value: "",
-            radio: true,
-            params: {
-                "id": 20221101095102,
-                "content": {
-                    'isAll': 0,
-                    "pageNumber": 1,
-                    "pageSize": 999999999,
-                    "where": {
-                        'condition': '',
-                        "unend":1
-                    }
-                }
+                label: "客户(企业)",
+                error: false,
+                errMsg: "",
+                type: "label",
+                value: "",
+                placeholder: "客户(企业)",
+                valueName: "enterprisename",
+                checking: "base",
+                slot: "info",
+                required: false
+            }, {
+                label: "联系人",
+                error: false,
+                errMsg: "",
+                type: "label",
+                value: "",
+                placeholder: "联系人",
+                valueName: "name",
+                checking: "base",
+                required: false
+            }, {
+                label: "手机号码",
+                error: false,
+                checking: "phone",
+                errMsg: "",
+                type: "number",
+                value: "",
+                placeholder: "手机号码",
+                valueName: "phonenumber", //绑定的字段名称
+                required: true, //必填
+            }, {
+                label: "省市县",
+                error: false,
+                errMsg: "",
+                type: "region",
+                value: "",
+                placeholder: "省市县",
+                valueName: "region",
+                checking: "base",
+                required: false
+            }, {
+                label: "详细地址",
+                error: false,
+                errMsg: "",
+                type: "label",
+                value: "",
+                placeholder: "详细地址",
+                valueName: "address",
+                checking: "base",
+                required: false
+            }, {
+                label: "项目名称",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "项目名称",
+                valueName: "projectname",
+                checking: "base",
+                required: false
+            }, {
+                label: "项目规模",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "请填写建筑面积(㎡)/吨位(t)",
+                valueName: "scale",
+                checking: "base",
+                required: false
+            }, {
+                label: "总投资额(百万)",
+                error: false,
+                errMsg: "",
+                type: "digit",
+                value: "",
+                placeholder: "请填写金额",
+                valueName: "totalinvestment",
+                checking: "base",
+                required: false
+            }, {
+                label: "造价(百万)",
+                error: false,
+                errMsg: "",
+                type: "digit",
+                value: "",
+                placeholder: "请填写金额",
+                valueName: "costofconstruction",
+                checking: "base",
+                required: false
+            }, {
+                label: "预计开工时间",
+                error: false,
+                errMsg: "",
+                type: "date",
+                fields: "month",
+                value: "",
+                placeholder: "预计开工时间",
+                valueName: "begdate_due",
+                checking: "base",
+                required: false
+            }, {
+                label: "预计完工时间",
+                error: false,
+                errMsg: "",
+                type: "date",
+                fields: "month",
+                value: "",
+                placeholder: "预计完工时间",
+                valueName: "enddate_due",
+                checking: "base",
+                required: false
             },
-            placeholder: "选择市场活动",
-            valueName: "campaign_name",
-            idName: 'sat_campaignid',
-            checking: "base",
-            required: false
-        }, {
-            label: "来源",
-            error: false,
-            errMsg: "",
-            type: "label",
-            value: "",
-            placeholder: "来源",
-            valueName: "cluesource",
-            checking: "base",
-            required: false
-        }, {
-            label: "备注",
-            error: false,
-            errMsg: "",
-            type: "label",
-            value: "",
-            placeholder: "备注",
-            valueName: "notes",
-            checking: "base",
-            required: false
-        }],
+            {
+                label: "市场活动",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/selectActivity/index",
+                model: "#Form",
+                value: "",
+                radio: true,
+                params: {
+                    "id": 20221101095102,
+                    "content": {
+                        nocache: true,
+                        'isAll': 0,
+                        "pageNumber": 1,
+                        "pageSize": 999999999,
+                        "where": {
+                            'condition': '',
+                            "unend": 1
+                        }
+                    }
+                },
+                placeholder: "选择市场活动",
+                valueName: "campaign_name",
+                idName: 'sat_campaignid',
+                checking: "base",
+                required: false
+            }, {
+                label: "来源",
+                error: false,
+                errMsg: "",
+                type: "label",
+                value: "",
+                placeholder: "来源",
+                valueName: "cluesource",
+                checking: "base",
+                required: false
+            }, {
+                label: "线索概括",
+                error: false,
+                errMsg: "",
+                type: "label",
+                value: "",
+                placeholder: "线索概括",
+                valueName: "notes",
+                checking: "base",
+                required: false
+            }
+        ],
         "content": {
             "sat_orderclueid": 0,
             "enterprisename": "",
@@ -132,7 +197,9 @@ Page({
                 form: this.data.form.map(v => {
                     if (v.valueName != 'region') {
                         if (v.valueName == 'campaign_name') {
-                            v.value = [data[v.valueName]]
+                            v.value = [data[v.valueName],
+                                [data.sat_campaignid]
+                            ]
                         } else {
                             v.value = data[v.valueName];
                         }

+ 1 - 0
packageA/saleClue/addClue.scss

@@ -8,6 +8,7 @@
     background: #FFFFFF;
     box-shadow: 0px -4rpx 16rpx 2rpx rgba(150, 157, 165, 0.16);
     bottom: 0;
+    z-index: 9999;
 
     .new-submit {
         width: 156rpx;

+ 148 - 29
packageA/saleClue/change.js

@@ -5,40 +5,159 @@ Page({
     data: {
         showAll: false,
         form: [{
-            label: "项目名称",
-            error: false,
-            errMsg: "",
-            type: "label",
-            value: "",
-            placeholder: "项目名称",
-            valueName: "projectname",
-            checking: "base",
-            required: true
-        }, {
-            label: "项目类型",
-            error: false,
-            errMsg: "",
-            type: "option",
-            optionNmae: "projecttype",
-            optionType: "radio", //复选   radio 单选
-            value: "",
-            placeholder: "项目类型",
-            valueName: "projecttype",
-            checking: "base",
-            required: true
-        }],
+                label: "项目名称",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "项目名称",
+                valueName: "projectname",
+                checking: "base",
+                required: true
+            }, {
+                label: "项目类型",
+                error: false,
+                errMsg: "",
+                type: "option",
+                optionNmae: "projecttype",
+                optionType: "radio", //复选   radio 单选
+                value: "",
+                placeholder: "选择类型",
+                valueName: "projecttype",
+                checking: "base",
+                required: true
+            }, {
+                label: "项目等级",
+                error: false,
+                errMsg: "",
+                type: "option",
+                optionNmae: "projectgrade",
+                optionType: "radio", //复选   radio 单选
+                value: "",
+                placeholder: "选择项目等级",
+                valueName: "grade",
+                checking: "base",
+                required: false
+            }, {
+                label: "省市县",
+                error: false,
+                errMsg: "",
+                type: "region",
+                value: [],
+                placeholder: "省/市/县",
+                valueName: "region",
+                required: true
+            }, {
+                label: "详细地址",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "详细地址",
+                valueName: "address",
+                checking: "base",
+                required: false
+            }, {
+                label: "项目规模",
+                error: false,
+                errMsg: "",
+                type: "textarea",
+                value: "",
+                placeholder: "请填写建筑面积(㎡)/吨位(t)",
+                valueName: "scale",
+                checking: "base",
+                required: false
+            }, {
+                label: "项目预算(万)",
+                error: false,
+                errMsg: "",
+                type: "digit",
+                value: "",
+                placeholder: "请填写金额",
+                valueName: "budgetary",
+                checking: "base",
+                required: false
+            }, {
+                label: "总投资额(百万)",
+                error: false,
+                errMsg: "",
+                type: "digit",
+                value: "",
+                placeholder: "请填写金额",
+                valueName: "totalinvestment",
+                checking: "base",
+                required: false
+            }, {
+                label: "造价(百万)",
+                error: false,
+                errMsg: "",
+                type: "digit",
+                value: "",
+                placeholder: "请填写金额",
+                valueName: "costofconstruction",
+                checking: "base",
+                required: false
+            }, {
+                label: "预计开工时间",
+                error: false,
+                errMsg: "",
+                type: "date",
+                fields: "month",
+                value: "",
+                placeholder: "预计开工时间",
+                valueName: "begdate_due",
+                checking: "base",
+                required: false
+            }, {
+                label: "预计完工时间",
+                error: false,
+                errMsg: "",
+                type: "date",
+                fields: "month",
+                value: "",
+                placeholder: "预计完工时间",
+                valueName: "enddate_due",
+                checking: "base",
+                required: false
+            },
+            {
+                label: "预计签约时间",
+                error: false,
+                errMsg: "",
+                type: "date",
+                fields: "month",
+                value: "",
+                placeholder: "预计签约时间",
+                valueName: "signdate_due",
+                checking: "base",
+                required: false
+            }
+        ],
         "content": {
-            "projecttype": "",
-            "projectname":"",
-            "sat_orderclueid":""
+            "sat_orderclueid": ""
         },
         disabled: true
     },
     onLoad(options) {
         let data = JSON.parse(options.rowData);
         this.setData({
-            'content.sat_orderclueid':data.sat_orderclueid
-        })
+            form: this.data.form.map(v => {
+                if (v.valueName != 'region') {
+                    if (v.valueName == 'campaign_name') {
+                        v.value = [data[v.valueName],
+                            [data.sat_campaignid]
+                        ]
+                    } else {
+                        v.value = data[v.valueName];
+                    }
+                } else {
+                    v.value = data.province ? [data.province, data.city, data.county] : []
+                }
+                return v
+            }),
+            'content.sat_orderclueid': data.sat_orderclueid,
+            'content.sat_campaignid': data.sat_campaignid
+        });
     },
     submit() {
         let content = {
@@ -46,7 +165,7 @@ Page({
             ...this.selectComponent("#Form").submit()
         };
         _Http.basic({
-            "id":"20221124154902",
+            "id": "20221124154902",
             content
         }).then(res => {
             console.log("转化", res)
@@ -59,7 +178,7 @@ Page({
                 wx.navigateBack()
                 getCurrentPages().forEach(item => {
                     console.log(item);
-                    if(item.__route__=='packageA/saleClue/detail') {
+                    if (item.__route__ == 'packageA/saleClue/detail') {
                         item.getDetail()
                     }
                 })

+ 63 - 34
packageA/saleClue/detail.js

@@ -92,9 +92,6 @@ Page({
                     }, {
                         label: "手机号",
                         value: res.data.phonenumber
-                    }, {
-                        label: "来源",
-                        value: res.data.cluesource
                     }, {
                         label: "市场活动",
                         value: res.data.campaign_name
@@ -116,31 +113,57 @@ Page({
                     },
                 ],
                 list1: [{
-                        label: "联系人",
-                        value: res.data.name
-                    }, {
-                        label: "手机号",
-                        value: res.data.phonenumber
-                    }, {
-                        label: "来源",
-                        value: res.data.cluesource
-                    }, {
-                        label: '负责人',
-                        value: res.data.leader && res.data.leader.length > 0 ? res.data.leader[0].name : ''
-                    },
-                    {
-                        label: '分配状态',
-                        value: res.data.allocationstatus
-                    },
-                    {
-                        label: '跟进状态',
-                        value: res.data.status
-                    },
-                    {
-                        label: '跟进次数',
-                        value: res.data.followcount || '0'
-                    },
-                ],
+                    label: "客户(企业)",
+                    value: res.data.enterprisename_customer
+                }, {
+                    label: "联系人",
+                    value: res.data.name
+                }, {
+                    label: "手机号码",
+                    value: res.data.phonenumber
+                }, {
+                    label: "省市县",
+                    value: res.data.province ? res.data.province + res.data.city + res.data.county : ''
+                }, {
+                    label: "地址",
+                    value: res.data.address
+                }, {
+                    label: "项目名称",
+                    value: res.data.projectname
+                }, {
+                    label: "项目规模",
+                    value: res.data.scale
+                }, {
+                    label: "总投资额(百万)",
+                    value: res.data.totalinvestment
+                }, {
+                    label: "造价(百万)",
+                    value: res.data.costofconstruction
+                }, {
+                    label: "预计开工时间",
+                    value: res.data.begdate_due
+                }, {
+                    label: "预计完工时间",
+                    value: res.data.enddate_due
+                }, {
+                    label: "市场活动",
+                    value: res.data.campaign_name
+                }, {
+                    label: "来源",
+                    value: res.data.cluesource
+                }, {
+                    label: "线索概括",
+                    value: res.data.notes
+                }, {
+                    label: '负责人',
+                    value: res.data.leader && res.data.leader.length > 0 ? res.data.leader[0].name : ''
+                }, {
+                    label: '分配状态',
+                    value: res.data.allocationstatus
+                }, {
+                    label: '跟进状态',
+                    value: res.data.status
+                }],
                 list2: [{
                     label: "创建人",
                     value: res.data.createBy
@@ -154,11 +177,11 @@ Page({
                     label: "分配时间",
                     value: res.data.assignedDate
                 }, {
-                    label: "最近编辑人",
-                    value: res.data.editBy
+                    label: "分配人",
+                    value: res.data.assignedBy
                 }, {
-                    label: "最近编辑时间",
-                    value: res.data.editDate
+                    label: "分配时间",
+                    value: res.data.assignedDate
                 }, {
                     label: "最近跟进人",
                     value: res.data.followBy
@@ -166,14 +189,20 @@ Page({
                     label: "最近跟进时间",
                     value: res.data.followDate
                 }, {
-                    label: "转化次数",
-                    value: res.data.iscustomer + res.data.isproject
+                    label: "最近编辑人",
+                    value: res.data.editBy
+                }, {
+                    label: "最近编辑时间",
+                    value: res.data.editDate
                 }, {
                     label: "无效原因",
                     value: res.data.invalidreason
                 }, {
                     label: "作废原因",
                     value: res.data.deletereason
+                }, {
+                    label: "跟进次数",
+                    value: res.data.followcount
                 }, {
                     label: "转手次数",
                     value: res.data.leader[0].leadernum

+ 3 - 3
packageA/saleClue/modules/list/list.wxml

@@ -1,5 +1,5 @@
-    <!--packageA/activity/modules/list/index.wxml-->
-    <navigator class="offer-list" url="/packageA/saleClue/detail?sat_orderclueid={{item.sat_orderclueid}}" wx:for="{{list}}" wx:key="sat_orderclueid">
+<!--packageA/activity/modules/list/index.wxml-->
+<navigator class="offer-list" url="/packageA/saleClue/detail?sat_orderclueid={{item.sat_orderclueid}}" wx:for="{{list}}" wx:key="sat_orderclueid">
     <view class="title">
         <text class="line-1">{{item.enterprisename_customer}}</text>
         <view class="status" style="background-color: {{backColor.getColor(item.status)}};">{{item.status}}</view>
@@ -14,7 +14,7 @@
 <My_empty wx:if="{{list.length == 0}}" />
 
 <wxs module="backColor">
-    module.exports.getColor = function(status) {
+    module.exports.getColor = function (status) {
         var color = null;
         if (status == '待跟进') {
             color = '#FA8C16';