Browse Source

代码提交

zhaoxiaohai 2 years ago
parent
commit
a02cdfeb11

+ 1 - 1
app.js

@@ -29,7 +29,7 @@ App({
     initSocket() {
         let that = this;
         this.globalData.SocketTask = wx.connectSocket({
-            url: 'wss://meida.cnyunl.com/yos/webSocket/' + wx.getStorageSync('userMsg').token,
+            url: 'wss://oms.idcgroup.com.cn:8079/yos/webSocket/' + wx.getStorageSync('userMsg').token,
             complete: (res) => {
                 console.log(res)
             }

+ 1 - 1
packageA/contract/detail.wxml

@@ -15,7 +15,7 @@
     <Product wx:else slot='{{detail.type=="工具使用(借用)协议"?  "工具清单": "产品明细折扣"}}' disabled="{{(per.query(options,'app')||isAdmin||isLeader)&&detail.status!='新建'}}" id='Product' />
     <PiscountType slot='产品类别折扣' id='PiscountType' disabled="{{(per.query(options,'app')||isAdmin||isLeader)&&detail.status!='新建'}}" />
     <Objective slot='业绩目标' id='Objective' />
-    <view slot='合同条款' />
+    <!-- <view slot='合同条款' /> -->
     <view style="height: 140rpx;" />
 </Yl_FunTabs>
 <!-- 底部 -->

+ 3 - 2
packageA/offers/detail.js

@@ -88,10 +88,11 @@ Page({
             isLeader = res.data.createuserid == wx.getStorageSync('userMsg').userid;
         if (isLeader || this.data.isAdmin) {
             //负责人/管理员默认权限功能
-            tabbarList = [{
+            /* {
                 icon: "icon-tabxiangmupinggu",
                 label: '打印'
-            }, {
+            }, */
+            tabbarList = [ {
                 icon: "icon-guanlian-fuzhi",
                 label: "复制"
             }, {

+ 5 - 1
packageA/project/modules/treaty/add/index.js

@@ -10,7 +10,7 @@ Page({
             "total": null,
             "where": {
                 "condition": "",
-                "type": 5,
+                "type": 6,
                 "sa_projectid": null
             }
         },
@@ -23,6 +23,10 @@ Page({
         })
         this.getList();
     },
+    tabChange(e) {
+        this.data.content.where.type = e.detail.title == '客户' ? 6 : 8;
+        this.getList(true)
+    },
     submit() {
         let pages = getCurrentPages();
         let list = this.data.result.map(v => this.data.list.find(value => value.sys_enterpriseid == v));

+ 3 - 0
packageA/project/modules/treaty/add/index.scss

@@ -3,6 +3,9 @@ page {
     overflow: hidden;
 }
 
+.custom-class{
+    border-bottom: 1px solid #ddd;
+}
 .total {
     height: 60rpx;
     line-height: 60rpx;

+ 4 - 0
packageA/project/modules/treaty/add/index.wxml

@@ -1,3 +1,7 @@
+<van-tabs bindchange="tabChange" color='var(--assist)' custom-class='custom-class'>
+    <van-tab title="客户" />
+    <van-tab title="经销商" />
+</van-tabs>
 <van-search class="search" value="{{ content.where.condition }}" shape="round" placeholder="请输入搜索关键词" bind:search='startSearch' bind:clear='onClear' />
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
     <view class="total">共{{content.total}}个</view>

+ 10 - 7
packageA/publicCustomer/index.js

@@ -116,16 +116,19 @@ Page({
     },
     /* 获取公海池列表 */
     getType() {
+
+
+
+
         _Http.basic({
-            "id": 20221206195102,
+            "classname": "sysmanage.develop.optiontype.optiontype",
+            "method": "optiontypeselect",
             "content": {
-                nocache: true,
                 "pageNumber": 1,
-                "pageSize": 20,
-                "where": {
-                    "condition": ""
-                }
-            }
+                "pageSize": 1000,
+                "typename": "customerpoolname",
+                "parameter": {}
+            },
         }, false).then(res => {
             console.log("公海池列表", res)
             let classList = res.data.map(v => {

+ 1 - 1
packageA/saleClue/change.json

@@ -1,4 +1,4 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText": "转化"
+    "navigationBarTitleText": "转化项目"
 }

+ 434 - 358
packageA/saleClue/translate.js

@@ -1,362 +1,438 @@
 let _Http = getApp().globalData.http,
-    count = null;
+	count = null;
 
 Page({
-    data: {
-        showAll: false,
-        repetitionShow: false,
-        repetitionList: [],
-        isSubmit: false,
-        form: [{
-            label: "企业名称",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "企业全称",
-            valueName: "enterprisename",
-            checking: "base",
-            slot: "info",
-            required: true
-        }, {
-            label: "企业简称",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "企业简称",
-            valueName: "abbreviation",
-            checking: "base",
-            required: false
-        }, {
-            label: "统一社会信用代码",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "企业税号/注册号/营业执照号码",
-            valueName: "taxno",
-            checking: "base",
-            required: false
-        }, {
-            label: "法定代表人",
-            error: false,
-            errMsg: "",
-            type: "text",
-            value: "",
-            placeholder: "企业法人",
-            valueName: "contact",
-            checking: "base",
-            required: false
-        }, {
-            label: "法人电话号码",
-            error: false,
-            errMsg: "",
-            type: "number",
-            value: "",
-            placeholder: "法人联系手机号",
-            valueName: "phonenumber",
-            checking: "phone",
-            required: false
-        }, {
-            label: "所属行业",
-            error: false,
-            errMsg: "",
-            type: "option", //自定义选择  配合预定接口
-            optionNmae: "industry", //选择类型
-            optionType: "radio", //复选   radio 单选
-            value: "",
-            placeholder: "企业所属行业",
-            valueName: "industry",
-            checking: "base",
-            required: false
-        }, {
-            label: "地区",
-            error: false,
-            errMsg: "",
-            type: "region",
-            value: [],
-            placeholder: "所属地区 省/市/区",
-            valueName: "region",
-            required: false
-        }, {
-            label: "注册地址",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "企业注册地址",
-            valueName: "address",
-            checking: "base",
-            required: false
-        }, {
-            label: "客户类型",
-            error: false,
-            errMsg: "",
-            type: "option",
-            optionNmae: "customertypemx",
-            optionType: "radio", //复选   radio 单选
-            value: "",
-            placeholder: "客户类型",
-            valueName: "type",
-            checking: "base",
-            required: true
-        }, {
-            label: "客户级别",
-            error: false,
-            errMsg: "",
-            type: "option",
-            optionNmae: "agentgrade",
-            optionType: "radio", //复选   radio 单选
-            value: "",
-            placeholder: "客户数字级别",
-            valueName: "grade",
-            checking: "base",
-            required: false
-        }],
-        content: {
-            "parentid": 0, //上级客户ID,默认或没有上级的时候传0
-            "source": "", //客户来源
-        },
-        disabled: true,
-        countDown: "", //查重倒计时
-    },
-    queryClient() {
-        let data = this.selectComponent("#Form").query();
-        if (data.enterprisename == '') {
-            wx.showToast({
-                title: `您还未填写企业名称`,
-                icon: "none"
-            });
-        } else {
-            this.setData({
-                form: this.selectComponent("#Form").data.form,
-            })
-            this.selectComponent("#Info").queryClient(data.enterprisename)
-        }
-    },
-    /* 工商查询 */
-    introduce({
-        detail
-    }) {
-        let item = detail;
-        let data = {
-            enterprisename: item.companyName, //企业名称
-            taxno: item.taxNum, //税号
-            contact: item.legalPerson, //法人
-            region: [item.regProvince, item.regCity, item.regArea], //地区
-            address: item.address, //地区
-        }
-        this.setData({
-            form: this.data.form.map(v => {
-                if (data[v.valueName]) v.value = data[v.valueName];
-                return v
-            })
-        })
-    },
-    setOption(item) {
-        let i = this.data.form.findIndex(v => v.valueName == item.valueName);
-        this.setData({
-            [`form[${i}]`]: item
-        })
-    },
-    onLoad(options) {
-        if (options.data) {
-            let data = JSON.parse(options.data);
-            console.log(data)
-            this.setData({
-                content: {
-                    sat_orderclueid: data.sat_orderclueid,
-                    parentid: data.parentid || 0,
-                    source: data.source || "",
-                },
-                form: this.data.form.map(v => {
-                    if (v.valueName == 'enterprisename') {
-                        v.value = data.enterprisename_customer;
-                    } else if (v.valueName != 'region') {
-                        v.value = data[v.valueName];
-                    } else {
-                        v.value = data.province ? [data.province, data.city, data.county] : []
-                    }
-                    return v
-                })
-            })
-        }
-    },
-    repClose() {
-        if (this.data.isSubmit) {
-            let that = this;
-            wx.showModal({
-                title: '提示',
-                content: `是否继续创建客户`,
-                complete: (res) => {
-                    if (res.confirm) that.handleSubmit(true);
-                }
-            })
-        }
-        this.setData({
-            repetitionShow: false,
-            isSubmit: false
-        })
-    },
-    /* 表单必填项是否完成 */
-    onConfirm({
-        detail
-    }) {
-        this.setData({
-            disabled: detail
-        })
-    },
-    // 是否显示全部
-    onChange({
-        detail
-    }) {
-        this.setData({
-            showAll: detail
-        })
-    },
-    /* 查询是否重复 */
-    async queryRepetition(e) {
-        let {
-            enterprisename,
-            taxno,
-            address
-        } = this.selectComponent("#Form").query();
-        if (enterprisename == '') return wx.showToast({
-            title: `您还未填写企业名称`,
-            icon: "none"
-        });
-        let res = await this.handleQueryRepetition({
-            sa_customersid: this.data.content.sa_customersid||0,
-            enterprisename,
-            taxno,
-            address
-        });
-        console.log("查询重复", res)
-        if (res.msg != '成功') return wx.showToast({
-            title: res.msg,
-            icon: "none"
-        });
-        this.setData({
-            countDown: 6
-        });
-        count = setInterval(() => {
-            let countDown = this.data.countDown;
-            if (countDown == 0) {
-                clearInterval(count);
-                this.setData({
-                    countDown: ""
-                })
-            } else {
-                countDown--;
-                this.setData({
-                    countDown
-                })
-            }
-        }, 1000)
-        if (res.total == 0) {
-            wx.showToast({
-                title: '未查询到疑似重复的客户信息',
-                icon: "none"
-            })
-        } else {
-            wx.showToast({
-                title: `查询到${res.total}条疑似重复客户信息`,
-                icon: "none"
-            })
-            this.setData({
-                repetitionShow: true,
-                repetitionList: res.data
-            })
-        }
-    },
-    /* 处理查重 */
-    handleQueryRepetition(content) {
-        return _Http.basic({
-            "id": 20221208172002,
-            content
-        })
-    },
-    async submit() {
-        let data = this.selectComponent("#Form").submit();
-        let query = await this.handleQueryRepetition({
-            sa_customersid: this.data.content.sa_customersid||0,
-            enterprisename: data.enterprisename,
-            taxno: data.taxno,
-            address: data.address
-        });
-        if (query.total != 0) {
-            wx.showToast({
-                title: `查询到${query.total}条疑似重复客户信息`,
-                icon: "none"
-            })
-            this.setData({
-                repetitionShow: true,
-                repetitionList: query.data,
-                isSubmit: true
-            })
-        } else {
-            this.handleSubmit();
-        }
-    },
-    handleSubmit(tag = false) {
-        let data = this.selectComponent("#Form").submit();
-        if (data.region.length != 0) {
-            data.province = data.region[0]
-            data.city = data.region[1]
-            data.county = data.region[2]
-        };
-        delete(data.region);
-        _Http.basic({
-            "id": 20221216184302,
-            "content": {
-                ...this.data.content,
-                ...data,
-            }
-        }).then(res => {
-            console.log("转化客户", res)
-            if (res.msg != '成功') return wx.showToast({
-                title: res.data,
-                icon: "none"
-            })
-            wx.showToast({
-                title: '转化成功',
-                icon: "none"
-            })
-            //绑定疑似重复标签
-            if (tag) _Http.basic({
-                "id": 20220929090901,
-                "content": {
-                    "ownertable": "sa_customers",
-                    "ownerid": res.data.sa_customersid,
-                    "datatag": ["疑似重复"]
-                }
-            })
-            setTimeout(() => {
-                getCurrentPages().forEach(v => {
-                    switch (v.__route__) {
-                        case 'packageA/saleClue/index':
-                            v.getList(true);
-                            break;
-                        case 'packageA/setclient/detail':
-                            v.getDetail();
-                            break;
-                    }
-                })
-                let pages = getCurrentPages();
-                if (pages[pages.length - 2].__route__ == 'packageA/saleClue/detail') {
-                    wx.navigateBack();
-                    getCurrentPages().forEach(item => {
-                        console.log(item);
-                        if(item.__route__=='packageA/saleClue/detail') {
-                            item.getDetail()
-                        }
-                    })
-                    wx.navigateTo({
-                        url: '/packageA/setclient/detail?id=' + res.data.sa_customersid,
-                    })
-                }
-            }, tag ? 500 : 300)
-        })
-    },
+	data: {
+		showAll: false,
+		repetitionShow: false,
+		repetitionList: [],
+		isSubmit: false,
+		form: [{
+			label: "客户(企业)",
+			error: false,
+			errMsg: "",
+			type: "textarea",
+			value: "",
+			placeholder: "客户(企业)名称",
+			valueName: "enterprisename",
+			checking: "base",
+			slot: "info",
+			required: true
+		}, {
+			label: "企业简称",
+			error: false,
+			errMsg: "",
+			type: "textarea",
+			value: "",
+			placeholder: "企业简称",
+			valueName: "abbreviation",
+			checking: "base",
+			required: false
+		}, {
+			label: "客户类型",
+			error: false,
+			errMsg: "",
+			type: "option",
+			optionNmae: "customertypemx",
+			optionType: "radio", //复选   radio 单选
+			value: "",
+			placeholder: "客户类型",
+			valueName: "type",
+			checking: "base",
+			required: true
+		}, {
+			label: "企业等级",
+			error: false,
+			errMsg: "",
+			type: "option",
+			optionNmae: "agentgrade",
+			optionType: "radio", //复选   radio 单选
+			value: "",
+			placeholder: "企业等级",
+			valueName: "grade",
+			checking: "base",
+			required: false
+		}, {
+			label: "客户分类",
+			error: false,
+			errMsg: "",
+			type: "option",
+			optionNmae: "customergrade",
+			optionType: "radio", //复选   radio 单选
+			value: "",
+			placeholder: "客户分类",
+			valueName: "customergrade",
+			checking: "base",
+			required: false
+		}, {
+			label: "客户行业",
+			error: false,
+			errMsg: "",
+			type: "option", //自定义选择  配合预定接口
+			optionNmae: "industry", //选择类型
+			optionType: "checkbox", //复选   radio 单选
+			value: "",
+			placeholder: "客户所属行业",
+			valueName: "industry",
+			checking: "base",
+			required: false
+		}, {
+			label: "税号",
+			error: false,
+			errMsg: "",
+			type: "textarea",
+			value: "",
+			placeholder: "企业税号",
+			valueName: "taxno",
+			checking: "base",
+			required: false
+		}, {
+			label: "法人",
+			error: false,
+			errMsg: "",
+			type: "text",
+			value: "",
+			placeholder: "企业法人",
+			valueName: "contact",
+			checking: "base",
+			required: false
+		}, {
+			label: "电话",
+			error: false,
+			errMsg: "",
+			type: "number",
+			value: "",
+			placeholder: "联系电话",
+			valueName: "telephone",
+			checking: "base",
+			required: false
+		}, {
+			label: "省市县",
+			error: false,
+			errMsg: "",
+			type: "region",
+			value: [],
+			placeholder: "所在地区",
+			valueName: "region",
+			required: false
+		}, {
+			label: "详细地址",
+			error: false,
+			errMsg: "",
+			type: "textarea",
+			value: "",
+			placeholder: "详细地址",
+			valueName: "address",
+			checking: "base",
+			required: false
+		}, {
+			label: "上级企业",
+			error: false,
+			errMsg: "",
+			type: "route",
+			url: "/packageA/select/setclient/select",
+			value: "",
+			params: {
+				id: 20221012164402,
+				content: {
+					nocache: true,
+					"type": 1,
+					"isExport": 0,
+					isend: 0,
+					"where": {
+						"condition": "",
+						"status": "", //状态
+						"startdate": "",
+						"enddate": ""
+					},
+					"sort": [{
+						sortname: "默认",
+						sorted: 1,
+						sortid: 67,
+						reversed: 0
+					}]
+				},
+			},
+			query: "&radio=true&idname=sa_customersid",
+			placeholder: "选择上级企业",
+			valueName: "parentid",
+			checking: "base",
+			required: false
+		}, {
+			label: "客户来源",
+			error: false,
+			errMsg: "",
+			type: "textarea",
+			value: "",
+			placeholder: "客户来源",
+			valueName: "source",
+			checking: "base",
+			required: false
+		}, {
+			label: "归属经销商",
+			error: false,
+			errMsg: "",
+			type: "route",
+			url: "/packageA/select/setclient/select",
+			value: "",
+			params: {
+				"id": 20230214162602,
+				"content": {
+					"hrid": wx.getStorageSync('userMsg').hrid,
+					"where": {
+						"condition": ""
+					}
+				},
+			},
+			query: "&radio=true&idname=sa_agentsid",
+			placeholder: "归属经销商",
+			valueName: "sa_agentsid",
+			checking: "base",
+			required: false
+		}],
+		content: {},
+		disabled: true,
+		countDown: "", //查重倒计时
+	},
+	queryClient() {
+		let data = this.selectComponent("#Form").query();
+		if (data.enterprisename == '') {
+			wx.showToast({
+				title: `您还未填写企业名称`,
+				icon: "none"
+			});
+		} else {
+			this.setData({
+				form: this.selectComponent("#Form").data.form,
+			})
+			this.selectComponent("#Info").queryClient(data.enterprisename)
+		}
+	},
+	/* 工商查询 */
+	introduce({
+		detail
+	}) {
+		let item = detail;
+		let data = {
+			enterprisename: item.companyName, //企业名称
+			taxno: item.taxNum, //税号
+			contact: item.legalPerson, //法人
+			region: [item.regProvince, item.regCity, item.regArea], //地区
+			address: item.address, //地区
+		}
+		this.setData({
+			form: this.data.form.map(v => {
+				if (data[v.valueName]) v.value = data[v.valueName];
+				return v
+			})
+		})
+	},
+	setOption(item) {
+		let i = this.data.form.findIndex(v => v.valueName == item.valueName);
+		this.setData({
+			[`form[${i}]`]: item
+		})
+	},
+	onLoad(options) {
+		if (options.data) {
+			let data = JSON.parse(options.data);
+			console.log(data)
+			data.source = data.cluesource; //来源
+			data.telephone = data.phonenumber; //电话
+			this.setData({
+				content: {
+					sat_orderclueid: data.sat_orderclueid,
+					parentid: data.parentid || 0,
+				},
+				form: this.data.form.map(v => {
+					if (v.valueName == 'enterprisename') {
+						v.value = data.enterprisename_customer;
+					} else if (v.valueName != 'region') {
+						v.value = data[v.valueName] || '';
+					} else {
+						v.value = data.province ? [data.province, data.city, data.county] : []
+					}
+					return v
+				})
+			})
+		}
+	},
+	repClose() {
+		if (this.data.isSubmit) {
+			let that = this;
+			wx.showModal({
+				title: '提示',
+				content: `是否继续创建客户`,
+				complete: (res) => {
+					if (res.confirm) that.handleSubmit(true);
+				}
+			})
+		}
+		this.setData({
+			repetitionShow: false,
+			isSubmit: false
+		})
+	},
+	/* 表单必填项是否完成 */
+	onConfirm({
+		detail
+	}) {
+		this.setData({
+			disabled: detail
+		})
+	},
+	// 是否显示全部
+	onChange({
+		detail
+	}) {
+		this.setData({
+			showAll: detail
+		})
+	},
+	/* 查询是否重复 */
+	async queryRepetition(e) {
+		let {
+			enterprisename,
+			taxno,
+			address
+		} = this.selectComponent("#Form").query();
+		if (enterprisename == '') return wx.showToast({
+			title: `您还未填写企业名称`,
+			icon: "none"
+		});
+		let res = await this.handleQueryRepetition({
+			sa_customersid: this.data.content.sa_customersid || 0,
+			enterprisename,
+			taxno,
+			address
+		});
+		console.log("查询重复", res)
+		if (res.msg != '成功') return wx.showToast({
+			title: res.msg,
+			icon: "none"
+		});
+		this.setData({
+			countDown: 6
+		});
+		count = setInterval(() => {
+			let countDown = this.data.countDown;
+			if (countDown == 0) {
+				clearInterval(count);
+				this.setData({
+					countDown: ""
+				})
+			} else {
+				countDown--;
+				this.setData({
+					countDown
+				})
+			}
+		}, 1000)
+		if (res.total == 0) {
+			wx.showToast({
+				title: '未查询到疑似重复的客户信息',
+				icon: "none"
+			})
+		} else {
+			wx.showToast({
+				title: `查询到${res.total}条疑似重复客户信息`,
+				icon: "none"
+			})
+			this.setData({
+				repetitionShow: true,
+				repetitionList: res.data
+			})
+		}
+	},
+	/* 处理查重 */
+	handleQueryRepetition(content) {
+		return _Http.basic({
+			"id": 20221208172002,
+			content
+		})
+	},
+	async submit() {
+		let data = this.selectComponent("#Form").submit();
+		let query = await this.handleQueryRepetition({
+			sa_customersid: this.data.content.sa_customersid || 0,
+			enterprisename: data.enterprisename,
+			taxno: data.taxno,
+			address: data.address
+		});
+		if (query.total != 0) {
+			wx.showToast({
+				title: `查询到${query.total}条疑似重复客户信息`,
+				icon: "none"
+			})
+			this.setData({
+				repetitionShow: true,
+				repetitionList: query.data,
+				isSubmit: true
+			})
+		} else {
+			this.handleSubmit();
+		}
+	},
+	handleSubmit(tag = false) {
+		let data = this.selectComponent("#Form").submit();
+		data.province = data.region[0] || "";
+		data.city = data.region[1] || "";
+		data.county = data.region[2] || "";
+		data.parentid = data.parentid[1] ? data.parentid[1][0] : 0;
+		data.sa_agentsid = data.sa_agentsid[1] ? data.sa_agentsid[1][0] : 0;
+		delete(data.region);
+
+		delete(data.region);
+		_Http.basic({
+			"id": 20221216184302,
+			"content": {
+				...this.data.content,
+				...data,
+			}
+		}).then(res => {
+			console.log("转化客户", res)
+			if (res.msg != '成功') return wx.showToast({
+				title: res.data,
+				icon: "none"
+			})
+			wx.showToast({
+				title: '转化成功',
+				icon: "none"
+			})
+			//绑定疑似重复标签
+			if (tag) _Http.basic({
+				"id": 20220929090901,
+				"content": {
+					"ownertable": "sa_customers",
+					"ownerid": res.data.sa_customersid,
+					"datatag": ["疑似重复"]
+				}
+			})
+			setTimeout(() => {
+				getCurrentPages().forEach(v => {
+					switch (v.__route__) {
+						case 'packageA/saleClue/index':
+							v.getList(true);
+							break;
+						case 'packageA/setclient/detail':
+							v.getDetail();
+							break;
+					}
+				})
+				let pages = getCurrentPages();
+				if (pages[pages.length - 2].__route__ == 'packageA/saleClue/detail') {
+					wx.navigateBack();
+					getCurrentPages().forEach(item => {
+						console.log(item);
+						if (item.__route__ == 'packageA/saleClue/detail') {
+							item.getDetail()
+						}
+					})
+					wx.navigateTo({
+						url: '/packageA/setclient/detail?id=' + res.data.sa_customersid,
+					})
+				}
+			}, tag ? 500 : 300)
+		})
+	},
 })

+ 1 - 1
packageA/saleClue/translate.json

@@ -2,5 +2,5 @@
     "usingComponents": {
         "information": "../setclient/modules/information/index"
     },
-    "navigationBarTitleText": "转客户"
+    "navigationBarTitleText": "转客户"
 }

+ 2 - 7
packageA/setclient/addAndEditor.js

@@ -134,7 +134,6 @@ Page({
             value: "",
             params: {
                 id: 20221012164402,
-                valueKey: "sa_customersid",
                 content: {
                     nocache: true,
                     "type": 1,
@@ -154,7 +153,7 @@ Page({
                     }]
                 },
             },
-            query: "&radio=true",
+            query: "&radio=true&idname=sa_customersid",
             placeholder: "选择上级企业",
             valueName: "parentid",
             checking: "base",
@@ -193,10 +192,8 @@ Page({
         }],
         content: {
             "sa_customersid": 0, //新增是传0
-            "parentid": 0, //上级客户ID,默认或没有上级的时候传0
             "sys_enterpriseid": 0, //合作企业档案ID,新增是传0,更新
             "sa_customerpoolid": 0, //客户池(公海池)ID,默认或没有的时候传0
-            "source": "", //客户来源
             ispublic: 0, //是否为公海客户
         },
         disabled: true,
@@ -248,14 +245,12 @@ Page({
                 disabled: false,
                 content: {
                     sa_customersid: data.sa_customersid,
-                    parentid: data.parentid,
                     sys_enterpriseid: data.sys_enterpriseid,
                     sa_customerpoolid: data.sa_customerpoolid,
-                    source: data.source,
                 },
                 form: this.data.form.map(v => {
                     if (v.valueName != 'region') {
-                        v.value = data[v.valueName];
+                        v.value = data[v.valueName] || "";
                         if (v.valueName == "grade") v.value = data[v.valueName] + "";
                     } else {
                         v.value = data.province ? [data.province, data.city, data.county] : []

+ 5 - 3
packageA/target/index.js

@@ -90,7 +90,6 @@ Page({
             this.setData({
                 userYearList: res.data.map(v => v.year),
                 "content.year": res.data.length ? res.data[res.data.length - 1].year : this.data.content.year,
-                year: res.data.length ? res.data[res.data.length - 1].year : this.data.year,
                 pickerIndex: res.data.length - 1
             })
             if (init) this.getData();
@@ -216,12 +215,13 @@ Page({
             });
             //绘制线图
             this.selectComponent("#line").render(lineData);
-            this.selectComponent("#histogram").render(histogram);
+            // this.selectComponent("#histogram").render(histogram);
             this.setData({
                 targetYear: {
                     yl: res.data.y1l,
                     yh: res.data.y1h,
                     ya: res.data.y1a,
+                    jl: (res.data.y1a == 0 && res.data.y1l == 0) ? '0.00%' : (res.data.y1a / res.data.y1l * 100).toFixed(2) + '%'
                 }
             });
             if (this.data.year == this.data.content.year) {
@@ -237,11 +237,13 @@ Page({
                         sl: res.data[`s${s}l`],
                         sh: res.data[`s${s}h`],
                         sa: res.data[`s${s}a`],
+                        jl: (res.data[`s${s}a`] == 0 && res.data[`s${s}l`] == 0) ? '0.00%' : (res.data[`s${s}a`] / res.data[`s${s}l`] * 100).toFixed(2) + '%'
                     },
                     targetMonth: {
                         ml: res.data[`m${m}l`],
                         mh: res.data[`m${m}h`],
-                        ma: res.data[`m${m}a`]
+                        ma: res.data[`m${m}a`],
+                        jl: (res.data[`m${m}a`] == 0 && res.data[`m${m}l`] == 0) ? '0.00%' : (res.data[`m${m}a`] / res.data[`m${m}l`] * 100).toFixed(2) + '%'
                     }
                 })
             }

+ 7 - 3
packageA/target/index.wxml

@@ -26,7 +26,7 @@
 <view class="box">
     <view class="label">
         <text class="iconfont icon-a-shouyeshujugaikuangzhanshishuju" />
-        <text>目标完成情况(金额:万元)</text>
+        <text>目标完成情况(元)</text>
     </view>
     <view class="content">
         <view class="col1">
@@ -41,22 +41,26 @@
                 <view>基本目标</view>
                 <view>挑战目标</view>
                 <view>实际完成</view>
+                <view>基本完成率</view>
             </view>
             <view class="row">
                 <view>{{targetYear.yl}}</view>
                 <view>{{targetYear.yh}}</view>
                 <view><text>{{targetYear.ya}}</text></view>
+                <view><text>{{targetYear.jl}}</text></view>
             </view>
             <block wx:if="{{content.year==year}}">
                 <view class="row">
                     <view>{{targetSeason.sl}}</view>
                     <view>{{targetSeason.sh}}</view>
                     <view><text>{{targetSeason.sa}}</text></view>
+                    <view><text>{{targetSeason.jl}}</text></view>
                 </view>
                 <view class="row">
                     <view>{{targetMonth.ml}}</view>
                     <view>{{targetMonth.mh}}</view>
                     <view><text>{{targetMonth.ma}}</text></view>
+                    <view><text>{{targetMonth.jl}}</text></view>
                 </view>
             </block>
         </view>
@@ -72,13 +76,13 @@
     <brokenLine id='line' />
 </view>
 <!-- 目标完成率 -->
-<view class="box">
+<!-- <view class="box">
     <view class="label">
         <text class="iconfont icon-a-shouyeshujugaikuangzhanshishuju" />
         <text>目标完成率(实际相对目标的完成率)</text>
     </view>
     <histogram id='histogram' />
-</view>
+</view>-->
 
 <view style="height: 130rpx;" />
 <view class="footer">

+ 3 - 2
utils/Http.js

@@ -1,6 +1,7 @@
 // const baseUrl = "https://meida.cnyunl.com/yos/rest/index";
-const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
-// const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
+// const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
+const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
+// const baseUrl = "https://oms.idcgroup.com.cn:8079/yos/rest/index";
 
 let count = null;
 class HTTP {