Ver código fonte

客户联系人修改

xiaohaizhao 3 anos atrás
pai
commit
6e1704bbdf

+ 429 - 428
packageA/setclient/addAndEditor.js

@@ -1,432 +1,433 @@
 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: "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: true
-        }, {
-            label: "联系电话",
-            error: false,
-            errMsg: "",
-            type: "number",
-            value: "",
-            placeholder: "联系电话",
-            valueName: "telephone",
-            checking: "base",
-            required: true
-        }, {
-            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: "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: {
-            "sa_customersid": 0, //新增是传0
-            "sys_enterpriseid": 0, //合作企业档案ID,新增是传0,更新
-            "sa_customerpoolid": 0, //客户池(公海池)ID,默认或没有的时候传0
-            ispublic: 0, //是否为公海客户
-        },
-        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);
-            this.setData({
-                disabled: false,
-                content: {
-                    sa_customersid: data.sa_customersid,
-                    sys_enterpriseid: data.sys_enterpriseid,
-                    sa_customerpoolid: data.sa_customerpoolid,
-                },
-                form: this.data.form.map(v => {
-                    if (v.valueName != 'region') {
-                        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] : []
-                    };
-                    if (data.isagent && ['enterprisename', 'region', 'sa_agentsid', 'grade', 'address', 'contact', 'telephone'].includes(v.valueName)) v.disabled = true;
-                    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,
-            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,
-            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);
-        _Http.basic({
-            "id": 20221012163902,
-            "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/setclient/index':
-                            v.getList(true);
-                            break;
-                        case 'packageA/setclient/detail':
-                            v.getDetail();
-                            wx.navigateBack()
-                            break;
-                    }
-                })
-                let pages = getCurrentPages();
-                if (pages[pages.length - 2].__route__ == 'packageA/setclient/index') wx.redirectTo({
-                    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: true
+		}, {
+			label: "联系电话",
+			error: false,
+			errMsg: "",
+			type: "number",
+			value: "",
+			placeholder: "联系电话",
+			valueName: "telephone",
+			checking: "base",
+			required: true
+		}, {
+			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: "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: {
+			"sa_customersid": 0, //新增是传0
+			"sys_enterpriseid": 0, //合作企业档案ID,新增是传0,更新
+			"sa_customerpoolid": 0, //客户池(公海池)ID,默认或没有的时候传0
+			phonenumber: "",
+			ispublic: 0, //是否为公海客户
+		},
+		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);
+			this.setData({
+				disabled: false,
+				content: {
+					sa_customersid: data.sa_customersid,
+					sys_enterpriseid: data.sys_enterpriseid,
+					sa_customerpoolid: data.sa_customerpoolid,
+				},
+				form: this.data.form.map(v => {
+					if (v.valueName != 'region') {
+						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] : []
+					};
+					if (data.isagent && ['enterprisename', 'region', 'sa_agentsid', 'grade', 'address', 'contact', 'telephone'].includes(v.valueName)) v.disabled = true;
+					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,
+			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,
+			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);
+		_Http.basic({
+			"id": 20221012163902,
+			"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/setclient/index':
+							v.getList(true);
+							break;
+						case 'packageA/setclient/detail':
+							v.getDetail();
+							wx.navigateBack()
+							break;
+					}
+				})
+				let pages = getCurrentPages();
+				if (pages[pages.length - 2].__route__ == 'packageA/setclient/index') wx.redirectTo({
+					url: '/packageA/setclient/detail?id=' + res.data.sa_customersid,
+				})
+			}, tag ? 500 : 300)
+		})
+	},
 })

+ 50 - 50
packageA/setclient/detail.wxml

@@ -1,69 +1,69 @@
 <!-- 头部 样式使用list样式 -->
 <view class="setclient-list-item" url="#">
-    <view class="con">
-        <view class="portrait {{detail.enterprisename <=2?'min-portrait':''}}">{{handle.getName(detail.enterprisename)}}</view>
-        <view class="mian">
-            <view class="label line-1">{{detail.enterprisename}}</view>
-            <view class="tag-box">
-                <Yl-tags id="Tags" add ownertable='sa_customers' bind:onGetList='onGetList' ownerid='{{sa_customersid}}' />
-            </view>
-        </view>
-        <view class="extend">
-            <!-- <Info /> -->
-        </view>
-    </view>
+	<view class="con">
+		<view class="portrait {{detail.enterprisename <=2?'min-portrait':''}}">{{handle.getName(detail.enterprisename)}}</view>
+		<view class="mian">
+			<view class="label line-1">{{detail.enterprisename}}</view>
+			<view class="tag-box">
+				<Yl-tags id="Tags" add ownertable='sa_customers' bind:onGetList='onGetList' ownerid='{{sa_customersid}}' />
+			</view>
+		</view>
+		<view class="extend">
+			<!-- <Info /> -->
+		</view>
+	</view>
 </view>
 <!-- 简介 -->
 <Yl_Detail list="{{briefs}}">
-    <!-- 团队管理 -->
-    <Yl-group id='Group' slot='bottom' add ownertable='sa_customers' ownerid='{{sa_customersid}}' />
+	<!-- 团队管理 -->
+	<Yl-group id='Group' slot='bottom' add ownertable='sa_customers' ownerid='{{sa_customersid}}' />
 </Yl_Detail>
 <view style="height: 20rpx;" />
 <!-- 功能 -->
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
-    <Trace slot='跟进动态' id='Trace' ownertable='sa_customers' ownerid='{{sa_customersid}}' />
-    <Work slot='任务' id='Work' ownertable='sa_customers' ownerid='{{sa_customersid}}' disabled="{{isAdmin||isLeader}}" />
-    <Project slot='项目商机' id="Project" />
-    <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
-    <Clue slot='线索' id='Clue' disabled="{{false}}" />
-    <Address slot='客户地址' id='Address' disabled="{{per.query(options,'address')||isAdmin||isLeader}}" />
-    <Contacts slot='联系人' id='Contacts' disabled="{{per.query(options,'contact')||isAdmin||isLeader}}" path='/packageA/setclient/modules/contacts/quickly/index' />
-    <Offers slot='报价单' id='Offers' disabled="{{per.query(options,'offer')||isAdmin||isLeader}}" />
-    <Contract slot='合同' id='Contract' />
-    <Account slot='账户余额' id='Account' />
-    <Bankcard slot='银行卡信息' id="Bankcard" />
-    <Financing slot='开票信息' id="Financing" disabled="{{per.query(options,'invoice')||isAdmin||isLeader}}" />
-    <Record slot="操作" id="Record" ownertable='sa_customers' ownerid='{{sa_customersid}}' />
-    <Files slot="附件" id="Files" ownertable='sa_customers' ownerid='{{sa_customersid}}' />
-    <view style="height: 140rpx;" />
+	<Trace slot='跟进动态' id='Trace' ownertable='sa_customers' ownerid='{{sa_customersid}}' />
+	<Work slot='任务' id='Work' ownertable='sa_customers' ownerid='{{sa_customersid}}' disabled="{{isAdmin||isLeader}}" />
+	<Project slot='项目商机' id="Project" />
+	<Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
+	<Clue slot='线索' id='Clue' disabled="{{false}}" />
+	<Address slot='客户地址' id='Address' disabled="{{per.query(options,'address')||isAdmin||isLeader}}" />
+	<Contacts slot='联系人' id='Contacts' disabled="{{per.query(options,'contact')||isAdmin||isLeader}}" path='/packageA/setclient/modules/contacts/quickly/index' enterprisename='{{detail.enterprisename}}' />
+	<Offers slot='报价单' id='Offers' disabled="{{per.query(options,'offer')||isAdmin||isLeader}}" />
+	<Contract slot='合同' id='Contract' />
+	<Account slot='账户余额' id='Account' />
+	<Bankcard slot='银行卡信息' id="Bankcard" />
+	<Financing slot='开票信息' id="Financing" disabled="{{per.query(options,'invoice')||isAdmin||isLeader}}" />
+	<Record slot="操作" id="Record" ownertable='sa_customers' ownerid='{{sa_customersid}}' />
+	<Files slot="附件" id="Files" ownertable='sa_customers' ownerid='{{sa_customersid}}' />
+	<view style="height: 140rpx;" />
 </Yl_FunTabs>
 <!-- 底部 -->
 <Yl_Tabbar wx:if="{{tabbarList.length}}" list='{{tabbarList}}' bind:callback="tabbarOnClick" />
 <!-- 处理四字 -->
 <wxs module="handle">
-    module.exports.getName = function (name) {
-        return name.substring(0, 4)
-    };
+	module.exports.getName = function (name) {
+		return name.substring(0, 4)
+	};
 </wxs>
 <!-- 查重 -->
 <van-popup show="{{ repetitionShow }}" custom-class='popup' round position="bottom" custom-style="height: 100%;" bind:close="repClose">
-    <view class="title">
-        查重
-        <van-icon custom-class='icon' size='40rpx' name="cross" bindtap="repClose" />
-    </view>
-    <navigator url="#" class="enterprise" wx:for="{{repetitionList}}" wx:key="sys_enterpriseid" data-item="{{item}}" bindtap="toRepDetail">
-        <view class="enterprise_title">{{item.enterprisename||" --"}}</view>
-        <view class="tag-box">
-            <van-tag custom-class='tag' wx:for="{{item.tag_sys}}" wx:key="index" wx:for-item='tag' color='#3874f6' text-color='#fff' round>{{tag}}</van-tag>
-            <van-tag custom-class='tag' wx:for="{{item.tag}}" wx:key="index" wx:for-item='tag' color='#FA8C16' text-color='#fff' round>{{tag}}</van-tag>
-        </view>
-        <view class="exp">客户地址:{{item.address||" --"}}</view>
-        <view class="exp">企业税号:{{item.taxno||" --"}}</view>
-        <view class="exp">客户类型:{{item.type||" --"}}</view>
-        <view class="exp">负责人:{{item.leader[0].name||" --"}}</view>
-        <view class="exp">手机号:{{item.phonenumber||" --"}}</view>
-        <view class="exp">成交状态:{{item.tradingstatus||" --"}}</view>
-        <view class="exp">最近跟进时间:{{item.followdate||" --"}}</view>
-    </navigator>
+	<view class="title">
+		查重
+		<van-icon custom-class='icon' size='40rpx' name="cross" bindtap="repClose" />
+	</view>
+	<navigator url="#" class="enterprise" wx:for="{{repetitionList}}" wx:key="sys_enterpriseid" data-item="{{item}}" bindtap="toRepDetail">
+		<view class="enterprise_title">{{item.enterprisename||" --"}}</view>
+		<view class="tag-box">
+			<van-tag custom-class='tag' wx:for="{{item.tag_sys}}" wx:key="index" wx:for-item='tag' color='#3874f6' text-color='#fff' round>{{tag}}</van-tag>
+			<van-tag custom-class='tag' wx:for="{{item.tag}}" wx:key="index" wx:for-item='tag' color='#FA8C16' text-color='#fff' round>{{tag}}</van-tag>
+		</view>
+		<view class="exp">客户地址:{{item.address||" --"}}</view>
+		<view class="exp">企业税号:{{item.taxno||" --"}}</view>
+		<view class="exp">客户类型:{{item.type||" --"}}</view>
+		<view class="exp">负责人:{{item.leader[0].name||" --"}}</view>
+		<view class="exp">手机号:{{item.phonenumber||" --"}}</view>
+		<view class="exp">成交状态:{{item.tradingstatus||" --"}}</view>
+		<view class="exp">最近跟进时间:{{item.followdate||" --"}}</view>
+	</navigator>
 </van-popup>
 <wxs src='../../utils/wxmlQueryPer.wxs' module="per" />

+ 312 - 244
packageA/setclient/modules/contacts/add/index.js

@@ -1,247 +1,315 @@
 const _Http = getApp().globalData.http;
 Page({
-    data: {
-        sys_phonebookid: null, //是否为快捷选择创建的账号
-        fromShowAll: false,
-        form: [{
-            label: "姓名",
-            error: false,
-            errMsg: "",
-            type: "text",
-            value: "",
-            placeholder: "联系人名称",
-            valueName: "name",
-            required: true,
-            checking: "base"
-        }, {
-            label: "手机号",
-            error: false,
-            errMsg: "",
-            type: "number",
-            value: "",
-            placeholder: "联系人手机号码",
-            valueName: "phonenumber",
-            required: true,
-            checking: "phone"
-        }, {
-            label: "部门",
-            error: false,
-            errMsg: "",
-            type: "text",
-            value: "",
-            placeholder: "联系人所属部门",
-            valueName: "depname",
-            required: false,
-            checking: "base"
-        }, {
-            label: "单位",
-            error: false,
-            errMsg: "",
-            type: "text",
-            value: "",
-            placeholder: "",
-            valueName: "dw",
-            required: false,
-            checking: "base",
-            disabled: true
-        }, {
-            label: "职位",
-            error: false,
-            errMsg: "",
-            type: "text",
-            value: "",
-            placeholder: "联系人职位",
-            valueName: "position",
-            required: false,
-            checking: "base"
-        }, {
-            label: "性别",
-            error: false,
-            errMsg: "",
-            type: "sex",
-            value: "",
-            placeholder: "联系人性别",
-            valueName: "sex",
-            required: false,
-            checking: "base"
-        }, {
-            label: "生日",
-            error: false,
-            errMsg: "",
-            type: "date",
-            value: "",
-            placeholder: "联系人生日",
-            valueName: "birthday",
-            required: false
-        }, {
-            label: "邮箱",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "请填写",
-            valueName: "email",
-            required: false,
-            checking: "mail"
-        }, {
-            label: "地区",
-            error: false,
-            errMsg: "",
-            type: "region",
-            value: [],
-            placeholder: "省,市,区",
-            valueName: "region",
-            required: false
-        }, {
-            label: "详细地址",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "例: 科创园11栋1103室",
-            valueName: "address",
-            required: false,
-            checking: "base"
-        }, {
-            label: "备注",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "请填写",
-            valueName: "remarks",
-            required: false,
-            checking: "base"
-        }],
-        disabled: true,
-        "content": {
-            "contactsid": 0, //地址id
-            "sys_enterpriseid": 0, //绑定数据
-            "isleader": 0, //默认0
-            "workaddress": 0,
-            "isdefault": 0, //是否默认地址
-            "isprimary": 0 //是否为主地址
-        }
-    },
-    onLoad(options) {
-        this.setData({
-            "content.sys_enterpriseid": options.sys_enterpriseid
-        });
-        if (options.data) {
-            let item = JSON.parse(options.data),
-                form = this.data.form.map(v => {
-                    if (v.valueName == 'region') {
-                        v.value = item.province ? [item.province, item.city, item.county] : []
-                    } else {
-                        v.value = Object.hasOwn(item, v.valueName) ? item[v.valueName] : v.value;
-                    }
-                    return v
-                });
-            let page = getCurrentPages()[getCurrentPages().length - 2];
-            form[3].value = page.data.detail.enterprisename;
-            this.setData({
-                form,
-                "disabled": false,
-                "content.contactsid": page.__route__ == 'packageA/setclient/detail' ? 0 : item.contactsid
-            });
-            if (item.sys_phonebookid) this.setData({
-                sys_phonebookid: item.sys_phonebookid
-            })
-        };
-    },
-    /* 提交数据 */
-    submit() {
-        let data = this.selectComponent("#Form").submit();
-        if (!data || this.data.disabled) return;
-        const content = {
-            ...this.data.content,
-            ...data,
-            "province": data.region[0] || "",
-            "city": data.region[1] || "",
-            "county": data.region[2] || "",
-            sys_phonebookid: ""
-        };
-        delete(content.region);
-        if (this.data.sys_phonebookid == null) {
-            this.handleSubmit(content);
-        } else {
-            let that = this;
-            wx.showModal({
-                title: '提示',
-                content: '是否删除原通讯录联系人信息',
-                complete({
-                    confirm
-                }) {
-                    content.sys_phonebookid = confirm ? that.data.sys_phonebookid : "";
-                    that.handleSubmit(content);
-                }
-            })
-        }
-    },
-    handleSubmit(content) {
-        _Http.basic({
-            "id": "20221018141802",
-            content
-        }).then(res => {
-            console.log("编辑联系人", res)
-            if (res.msg != '成功') return wx.showToast({
-                title: res.data,
-                icon: "none"
-            });
-            wx.showToast({
-                title: '保存成功',
-                icon: "none"
-            });
-            setTimeout(() => {
-                wx.navigateBack()
-                getCurrentPages().forEach(v => {
-                    if (v.__route__ == 'packageA/setclient/modules/contacts/detail/index') {
-                        v.getDetail();
-                    } else if (v.selectComponent("#Contacts")) {
-                        let page = v.selectComponent("#Contacts"),
-                            list = page.data.list,
-                            index = list.findIndex(value => value.contactsid == res.data.contactsid);
-                        if (index != -1) {
-                            //列表中存在说明是编辑,返回上一级页面并更新数据
-                            list[index] = res.data;
-                            page.setData({
-                                list
-                            });
-                        } else {
-                            //列表中不存在说明是新增,返回上一级页面更新数据 并进入详情
-                            list.push(res.data);
-                            page.setData({
-                                list,
-                                "content.total": page.data.content.total + 1
-                            });
-                            wx.navigateTo({
-                                url: '/packageA/setclient/modules/contacts/detail/index?contactsid=' + res.data.contactsid
-                            })
-                        }
-                    } else if (v.__route__ == 'packageA/project/modules/contacts/search/index') {
-                        let index = v.data.list.findIndex(value => value.contactsid == res.data.contactsid);
-                        if (index != -1) v.setData({
-                            [`list[${index}]`]: res.data
-                        })
-                    }
-                });
-            }, 500)
-        });
-    },
-    /* 表单是否填写完成 */
-    onConfirm({
-        detail
-    }) {
-        this.setData({
-            disabled: detail
-        })
-    },
-    /* 是否显示全部 */
-    changefromShowAll({
-        detail
-    }) {
-        this.setData({
-            fromShowAll: detail
-        })
-    },
+	data: {
+		sys_phonebookid: null, //是否为快捷选择创建的账号
+		fromShowAll: false,
+		form: [{
+			label: "姓名",
+			error: false,
+			errMsg: "",
+			type: "text",
+			value: "",
+			placeholder: "联系人名称",
+			valueName: "name",
+			required: true,
+			checking: "base"
+		}, {
+			label: "联系方式",
+			error: false,
+			errMsg: "",
+			hint: "",
+			type: "radio",
+			value: "0",
+			radioList: [{
+				id: '0',
+				name: '手机号'
+			}, {
+				id: '1',
+				name: '座机电话'
+			}],
+			valueName: "isTelephone", //绑定的字段名称
+			required: true, //必填
+			interrupt: true,
+			checking: `true`,
+			phonenumber: "",
+			telephone: ["", ""]
+		}, {
+			label: "手机号",
+			error: false,
+			errMsg: "",
+			type: "number",
+			value: "",
+			placeholder: "联系人手机号码",
+			valueName: "phonenumber",
+			required: true,
+			checking: "phone"
+		}, {
+			label: "邮箱",
+			error: false,
+			errMsg: "",
+			type: "textarea",
+			value: "",
+			placeholder: "请填写",
+			valueName: "email",
+			required: false,
+			checking: "mail"
+		}, {
+			label: "传真",
+			error: false,
+			errMsg: "",
+			type: "textarea",
+			value: "",
+			placeholder: "请填写",
+			valueName: "fax",
+			required: false,
+		}, {
+			label: "单位",
+			error: false,
+			errMsg: "",
+			type: "route",
+			url: "/packageA/project/modules/contacts/select/index",
+			value: "",
+			query: "&radio=true",
+			placeholder: "选择单位",
+			valueName: "sys_enterpriseid",
+			required: true,
+			checking: "base",
+			disabled: true
+		}, {
+			label: "部门",
+			error: false,
+			errMsg: "",
+			type: "text",
+			value: "",
+			placeholder: "联系人所属部门",
+			valueName: "depname",
+			required: false,
+			checking: "base"
+		}, {
+			label: "职位",
+			error: false,
+			errMsg: "",
+			type: "text",
+			value: "",
+			placeholder: "联系人职位",
+			valueName: "position",
+			required: false,
+			checking: "base"
+		}, {
+			label: "性别",
+			error: false,
+			errMsg: "",
+			type: "sex",
+			value: "男",
+			placeholder: "联系人性别",
+			valueName: "sex",
+			required: false,
+			checking: "base"
+		}, {
+			label: "生日",
+			error: false,
+			errMsg: "",
+			type: "date",
+			value: "",
+			placeholder: "联系人生日",
+			valueName: "birthday",
+			required: false
+		}, {
+			label: "家庭地址",
+			error: false,
+			errMsg: "",
+			type: "textarea",
+			value: "",
+			placeholder: "家庭地址",
+			valueName: "address",
+			required: false,
+			checking: "base"
+		}, {
+			label: "备注",
+			error: false,
+			errMsg: "",
+			type: "textarea",
+			value: "",
+			placeholder: "请填写",
+			valueName: "remarks",
+			required: false,
+			checking: "base"
+		}],
+		disabled: true,
+		"content": {
+			"contactsid": 0, //地址id
+			"sys_enterpriseid": 0, //绑定数据
+			"isleader": 0, //默认0
+			"workaddress": 0,
+			"isdefault": 0, //是否默认地址
+			"isprimary": 0 //是否为主地址
+		}
+	},
+	onLoad(options) {
+		this.data.content.sys_enterpriseid = options.sys_enterpriseid;
+		if (options.data) {
+			let item = JSON.parse(options.data),
+				arr = item.phonenumber.split("-");
+			item.isTelephone = arr.length == 2 ? "1" : "0";
+			item.sys_enterpriseid = [options.enterprisename, [options.sys_enterpriseid]];
+			this.setData({
+				form: this.data.form.map(v => {
+					if (v.valueName == 'phonenumber') {
+						v = arr.length == 2 ? {
+							label: "电话",
+							error: false,
+							errMsg: "",
+							type: "telephone",
+							value: arr,
+							placeholder: "联系人手机号码",
+							valueName: "telephone",
+							required: true,
+							checking: "telephone"
+						} : {
+							label: "手机号",
+							error: false,
+							errMsg: "",
+							type: "number",
+							value: arr[0],
+							placeholder: "联系人手机号码",
+							valueName: "phonenumber",
+							required: true,
+							checking: "phone"
+						}
+					} else {
+						v.value = Object.hasOwn(item, v.valueName) ? item[v.valueName] : v.value;
+					}
+					return v
+				}),
+				"disabled": false,
+				"content.contactsid": options.contactsid || 0
+			});
+			if (item.sys_phonebookid) this.setData({
+				sys_phonebookid: item.sys_phonebookid
+			})
+		} else {
+			this.data.form.find(v => v.label == '单位').value = [options.enterprisename, [options.sys_enterpriseid]];
+			this.setData({
+				form: this.data.form
+			})
+		}
+	},
+	/* 打断 */
+	interrupt({
+		detail
+	}) {
+		let {
+			data,
+			form
+		} = detail;
+		if (data.label == '联系方式') {
+			if (data.value == 0) {
+				data.telephone = form[2].value;
+				form[2] = {
+					label: "手机号",
+					error: false,
+					errMsg: "",
+					type: "number",
+					value: data.phonenumber,
+					placeholder: "联系人手机号码",
+					valueName: "phonenumber",
+					required: true,
+					checking: "phone"
+				}
+			} else {
+				data.phonenumber = form[2].value;
+				form[2] = {
+					label: "电话",
+					error: false,
+					errMsg: "",
+					type: "telephone",
+					value: data.telephone,
+					placeholder: "联系人手机号码",
+					valueName: "telephone",
+					required: true,
+					checking: "telephone"
+				}
+			};
+			this.setData({
+				form
+			})
+		}
+	},
+	/* 提交数据 */
+	submit() {
+		let data = this.selectComponent("#Form").submit();
+		if (!data || this.data.disabled) return;
+		const content = {
+			...this.data.content,
+			...data,
+			sys_phonebookid: ""
+		};
+		if (content.telephone) {
+			content.phonenumber = content.telephone.join("-");
+			delete(content.telephone)
+		}
+		content.sys_enterpriseid = this.data.content.sys_enterpriseid;
+		if (this.data.sys_phonebookid == null) {
+			this.handleSubmit(content);
+		} else {
+			let that = this;
+			wx.showModal({
+				title: '提示',
+				content: '是否删除原通讯录联系人信息',
+				complete({
+					confirm
+				}) {
+					content.sys_phonebookid = confirm ? that.data.sys_phonebookid : "";
+					that.handleSubmit(content);
+				}
+			})
+		}
+	},
+	handleSubmit(content) {
+		console.log(content)
+		_Http.basic({
+			"id": "20221018141802",
+			content
+		}).then(res => {
+			console.log("编辑联系人", res)
+			wx.showToast({
+				title: res.msg != '成功' ? res.data : '保存成功',
+				icon: "none",
+				mask: true
+			});
+			if (res.msg == '成功') setTimeout(() => {
+				wx.navigateBack()
+				getCurrentPages().forEach(v => {
+					if (v.__route__ == 'packageA/setclient/modules/contacts/detail/index') {
+						v.getDetail();
+					} else if (v.selectComponent("#Contacts")) {
+						let page = v.selectComponent("#Contacts");
+						page.getList(page.data.content.sys_enterpriseid, true)
+					} else if (v.__route__ == 'packageA/project/modules/contacts/search/index') {
+						let index = v.data.list.findIndex(value => value.contactsid == res.data.contactsid);
+						if (index != -1) v.setData({
+							[`list[${index}]`]: res.data
+						})
+					}
+				});
+			}, 500)
+
+		});
+	},
+	/* 表单是否填写完成 */
+	onConfirm({
+		detail
+	}) {
+		this.setData({
+			disabled: detail
+		})
+	},
+	/* 是否显示全部 */
+	changefromShowAll({
+		detail
+	}) {
+		this.setData({
+			fromShowAll: detail
+		})
+	},
 })

+ 2 - 2
packageA/setclient/modules/contacts/add/index.wxml

@@ -1,6 +1,6 @@
 <Yl_Headline title='基本信息' type='switch' switchLabel='仅显示必填项' switch='{{fromShowAll}}' bind:callBack='changefromShowAll' />
-<Yl_field id='Form' showAll='{{!fromShowAll}}' form="{{form}}" bind:onConfirm='onConfirm' />
+<Yl_field id='Form' showAll='{{!fromShowAll}}' form="{{form}}" bind:onConfirm='onConfirm' bind:interrupt='interrupt' />
 
 <view class="footer">
-    <van-button custom-class='but' disabled='{{disabled}}' bindtap="submit">确定</van-button>
+	<van-button custom-class='but' disabled='{{disabled}}' bindtap="submit">确定</van-button>
 </view>

+ 2 - 2
packageA/setclient/modules/contacts/detail/index.js

@@ -36,14 +36,14 @@ Page({
                     label: "单位",
                     value: item.enterprisename
                 }, {
-                    label: "手机号码",
+                    label: "联系方式",
                     value: item.phonenumber
                 }/* , {
                     label: "最近跟进时间",
                     value: ""
                 } */],
                 list1: [{
-                    label: "手机号码",
+                    label: "联系方式",
                     value: item.phonenumber
                 }, {
                     label: "性别",

+ 68 - 70
packageA/setclient/modules/contacts/index.js

@@ -1,73 +1,71 @@
 const _Http = getApp().globalData.http;
 Component({
-    properties: {
-        disabled: Boolean,
-        path: String,
-    },
-    data: {
-        list: [],
-        sys_enterpriseid: "",
-        content: {
-            "nacache": true,
-            "pageNumber": 1,
-            "pageSize": 10,
-            "pageTotal": 1,
-            "total": null,
-            "where": {
-                "condition": "",
-                "workaddress": 0
-            }
-        },
-    },
-    methods: {
-        getList(id, init) {
-            let content = this.data.content;
-            content.sys_enterpriseid = id;
-            console.log("id", id)
-            if (init) {
-                content.pageNumber = 1
-                content.pageTotal = 1
-            }
-            _Http.basic({
-                "id": "20221022165503",
-                content
-            }).then(res => {
-                console.log("联系人", res)
-                if (res.msg != '成功') return wx.showToast({
-                    title: res.data,
-                    icon: "none"
-                })
-                this.setData({
-                    list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
-                    "content.pageNumber": res.pageNumber + 1,
-                    "content.pageSize": res.pageSize,
-                    "content.pageTotal": res.pageTotal,
-                    "content.total": res.total,
-                    sys_enterpriseid: id
-                })
-            })
-        },
-        toSearch() {
-            wx.navigateTo({
-                url: '/packageA/setclient/modules/contacts/search/index?perams=' + JSON.stringify({
-                    sys_enterpriseid: this.data.sys_enterpriseid,
-                    "nacache": true,
-                    "pageNumber": 1,
-                    "pageSize": 20,
-                    "pageTotal": 1,
-                    "total": 0,
-                    "where": {
-                        "condition": "",
-                        "workaddress": 0
-                    }
-                }),
-            })
-        },
-        /* 修改总数 */
-        changeTotal() {
-            this.setData({
-                "content.total": this.data.content.total - 1
-            })
-        }
-    }
+	properties: {
+		disabled: Boolean,
+		path: String,
+		enterprisename: String
+	},
+	data: {
+		list: [],
+		sys_enterpriseid: "",
+		content: {
+			"nacache": true,
+			"pageNumber": 1,
+			"pageSize": 10,
+			"pageTotal": 1,
+			"total": null,
+			"where": {
+				"condition": "",
+				"workaddress": 0
+			}
+		},
+	},
+	methods: {
+		getList(id, init) {
+			let content = this.data.content;
+			content.sys_enterpriseid = id;
+			if (init) content.pageNumber = 1;
+			console.log(content)
+			_Http.basic({
+				"id": "20221022165503",
+				content
+			}).then(res => {
+				console.log("联系人", res)
+				if (res.msg != '成功') return wx.showToast({
+					title: res.data,
+					icon: "none"
+				})
+				this.setData({
+					list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
+					"content.pageNumber": res.pageNumber + 1,
+					"content.pageSize": res.pageSize,
+					"content.pageTotal": res.pageTotal,
+					"content.total": res.total,
+					sys_enterpriseid: id
+				})
+			})
+		},
+		toSearch() {
+			wx.navigateTo({
+				url: '/packageA/setclient/modules/contacts/search/index?perams=' + JSON.stringify({
+					sys_enterpriseid: this.data.sys_enterpriseid,
+					"nacache": true,
+					"pageNumber": 1,
+					"pageSize": 20,
+					"pageTotal": 1,
+					"total": 0,
+					"where": {
+						"condition": "",
+						"workaddress": 0
+					}
+				}),
+			})
+		},
+		/* 修改总数 */
+		changeTotal() {
+			this.setData({
+				"content.total": this.data.content.total - 1
+			})
+		}
+	}
 })

+ 12 - 12
packageA/setclient/modules/contacts/index.wxml

@@ -1,15 +1,15 @@
 <view class="head">
-    <view class="count">
-        总共{{content.total}}个
-    </view>
-    <view class="expand">
-        <navigator url="#" class="but" bindtap="toSearch">
-            <van-icon name="search" />
-        </navigator>
-        <navigator wx:if="{{disabled}}" url="{{path+'?sys_enterpriseid='+sys_enterpriseid}}" class="but">
-            <van-icon name="plus" />
-        </navigator>
-    </view>
+	<view class="count">
+		总共{{content.total}}个
+	</view>
+	<view class="expand">
+		<!-- <navigator url="#" class="but" bindtap="toSearch">
+			<van-icon name="search" />
+		</navigator> -->
+		<navigator wx:if="{{disabled}}" url="{{path+'?sys_enterpriseid='+sys_enterpriseid+'&enterprisename='+enterprisename}}" class="but">
+			<van-icon name="plus" />
+		</navigator>
+	</view>
 </view>
 
-<list list='{{list}}' disabled='{{disabled}}' bindchangeTotal="changeTotal" />
+<list list='{{list}}' disabled='{{disabled}}' enterprisename='{{enterprisename}}' sys_enterpriseid='{{sys_enterpriseid}}' bindchangeTotal="changeTotal" />

+ 81 - 79
packageA/setclient/modules/contacts/list/index.js

@@ -1,82 +1,84 @@
 const _Http = getApp().globalData.http;
 Component({
-    options: {
-        addGlobalClass: true
-    },
-    properties: {
-        list: Array,
-        changeTotal: Function,
-        disabled: Boolean
-    },
-    data: {},
-    methods: {
-        handleItem(e) {
-            const {
-                name,
-                item
-            } = e.target.dataset,
-                that = this;
-            switch (name) {
-                case "call":
-                    wx.makePhoneCall({
-                        phoneNumber: item.phonenumber,
-                    })
-                    break;
-                case "delete":
-                    wx.showModal({
-                        title: '提示',
-                        content: `是否确认删除"${item.name}"`,
-                        complete: (res) => {
-                            if (res.confirm) _Http.basic({
-                                "id": "20221018145502",
-                                "content": {
-                                    "contactsid": item.contactsid,
-                                    "sys_enterpriseid": item.sys_enterpriseid
-                                }
-                            }).then(res => {
-                                console.log("删除联系人", res)
-                                if (res.msg != '成功') return wx.showToast({
-                                    title: res.data,
-                                    icon: "none"
-                                });
-                                that.triggerEvent("changeTotal")
-                                wx.showToast({
-                                    title: `删除成功!`,
-                                    icon: "none"
-                                })
-                                getCurrentPages().forEach(v => {
-                                    if (v.__route__ == "packageA/setclient/detail" || v.__route__ == "packageA/opponent/detail" || v.__route__ == "packageA/publicCustomer/detail") {
-                                        let model = v.selectComponent("#Contacts");
-                                        model.setData({
-                                            list: model.data.list.filter(value => value.contactsid != item.contactsid)
-                                        });
-                                        // model.changeTotal();
-                                    } else if (v.__route__ == "packageA/setclient/modules/contacts/search/index") {
-                                        v.setData({
-                                            list: v.data.list.filter(value => value.contactsid != item.contactsid)
-                                        });
-                                    } else if (v.__route__ == "packageA/setclient/modules/contacts/detail/index") {
-                                        wx.navigateBack()
-                                    }
-                                })
-                            })
-                        }
-                    })
-                    break;
-                case "edit":
-                    wx.navigateTo({
-                        url: `/packageA/setclient/modules/contacts/add/index?data=${JSON.stringify(item)}`
-                    })
-                    break;
-            }
-        },
-        toDetail(e) {
-            const {
-                item
-            } = e.currentTarget.dataset;
-            wx.navigateTo({
-                url: '/packageA/setclient/modules/contacts/detail/index?contactsid=' + item.contactsid
-            })
-        },
-    }
+	options: {
+		addGlobalClass: true
+	},
+	properties: {
+		list: Array,
+		changeTotal: Function,
+		disabled: Boolean,
+		enterprisename: String,
+		sys_enterpriseid: String
+	},
+	data: {},
+	methods: {
+		handleItem(e) {
+			const {
+				name,
+				item
+			} = e.target.dataset,
+				that = this;
+			switch (name) {
+				case "call":
+					wx.makePhoneCall({
+						phoneNumber: item.phonenumber,
+					})
+					break;
+				case "delete":
+					wx.showModal({
+						title: '提示',
+						content: `是否确认删除"${item.name}"`,
+						complete: (res) => {
+							if (res.confirm) _Http.basic({
+								"id": "20221018145502",
+								"content": {
+									"contactsid": item.contactsid,
+									"sys_enterpriseid": item.sys_enterpriseid
+								}
+							}).then(res => {
+								console.log("删除联系人", res)
+								if (res.msg != '成功') return wx.showToast({
+									title: res.data,
+									icon: "none"
+								});
+								that.triggerEvent("changeTotal")
+								wx.showToast({
+									title: `删除成功!`,
+									icon: "none"
+								})
+								getCurrentPages().forEach(v => {
+									if (v.__route__ == "packageA/setclient/detail" || v.__route__ == "packageA/opponent/detail" || v.__route__ == "packageA/publicCustomer/detail") {
+										let model = v.selectComponent("#Contacts");
+										model.setData({
+											list: model.data.list.filter(value => value.contactsid != item.contactsid)
+										});
+										// model.changeTotal();
+									} else if (v.__route__ == "packageA/setclient/modules/contacts/search/index") {
+										v.setData({
+											list: v.data.list.filter(value => value.contactsid != item.contactsid)
+										});
+									} else if (v.__route__ == "packageA/setclient/modules/contacts/detail/index") {
+										wx.navigateBack()
+									}
+								})
+							})
+						}
+					})
+					break;
+				case "edit":
+					wx.navigateTo({
+						url: `/packageA/setclient/modules/contacts/add/index?data=${JSON.stringify(item)}&enterprisename=${this.data.enterprisename}&sys_enterpriseid=${this.data.sys_enterpriseid}&contactsid=${item.contactsid}`
+					})
+					break;
+			}
+		},
+		toDetail(e) {
+			const {
+				item
+			} = e.currentTarget.dataset;
+			wx.navigateTo({
+				url: '/packageA/setclient/modules/contacts/detail/index?contactsid=' + item.contactsid
+			})
+		},
+	}
 })

+ 83 - 82
packageA/setclient/modules/contacts/quickly/index.js

@@ -1,89 +1,90 @@
 const _Http = getApp().globalData.http;
 
 Page({
-    data: {
-        active: 0,
-        content: {
-            sys_enterpriseid: "",
-            nocache: true,
-            pageNumber: 1,
-            pageSize: 20,
-            pageTotal: 1,
-            total: 0,
-            where: {
-                "condition": "",
-            }
-        },
-        list: [],
-    },
-    getList(init = false) {
-        const content = this.data.content;
-        if (init) content.pageNumber = 1;
-        if (content.pageNumber > content.pageTotal) return;
+	data: {
+		active: 0,
+		content: {
+			sys_enterpriseid: "",
+			nocache: true,
+			pageNumber: 1,
+			pageSize: 20,
+			pageTotal: 1,
+			total: 0,
+			where: {
+				"condition": "",
+			}
+		},
+		list: [],
+	},
+	getList(init = false) {
+		const content = this.data.content;
+		if (init) content.pageNumber = 1;
+		if (content.pageNumber > content.pageTotal) return;
+		_Http.basic({
+			id: this.data.active == 0 ? 20221219161202 : 20221219193002,
+			content
+		}).then(res => {
+			console.log("通讯录列表", res)
 
-        _Http.basic({
-            id: this.data.active == 0 ? 20221219161202 : 20221219193002,
-            content
-        }).then(res => {
-            console.log("通讯录列表", res)
+			if (res.msg != '成功') return wx.showToast({
+				title: res.data,
+				icon: "none"
+			});
 
-            if (res.msg != '成功') return wx.showToast({
-                title: res.data,
-                icon: "none"
-            });
+			content.pageNumber = res.pageNumber + 1;
+			content.pageTotal = res.pageTotal;
+			content.total = res.total;
 
-            content.pageNumber = res.pageNumber + 1;
-            content.pageTotal = res.pageTotal;
-            content.total = res.total;
-
-            this.setData({
-                list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
-                content
-            })
-        })
-    },
-    onChange(e) {
-        this.setData({
-            active: e.detail.index
-        });
-        this.getList(true);
-    },
-    onLoad(options) {
-        if (options.sys_enterpriseid) this.setData({
-            'content.sys_enterpriseid': options.sys_enterpriseid
-        });
-        this.getList();
-    },
-    /* 默认添加 */
-    created() {
-        wx.redirectTo({
-            url: '/packageA/setclient/modules/contacts/add/index?sys_enterpriseid=' + this.data.content.sys_enterpriseid,
-        })
-    },
-    onClick(e) {
-        const {
-            item
-        } = e.currentTarget.dataset;
-        delete(item.tag1)
-        wx.redirectTo({
-            url: `/packageA/setclient/modules/contacts/add/index?sys_enterpriseid=${this.data.content.sys_enterpriseid}&data=${JSON.stringify(item)}`,
-        })
-    },
-    onSearch({
-        detail
-    }) {
-        this.setData({
-            'parems.content.where.condition': detail ? detail : ""
-        });
-        this.getList(true);
-    },
-    onClear() {
-        this.setData({
-            'parems.content.where.condition': ""
-        });
-        this.getList(true);
-    },
-    onReachBottom() {
-        this.getList();
-    },
+			this.setData({
+				list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
+				content
+			})
+		})
+	},
+	onChange(e) {
+		this.setData({
+			active: e.detail.index
+		});
+		this.getList(true);
+	},
+	onLoad(options) {
+		console.log(options)
+		if (options.sys_enterpriseid) this.setData({
+			'content.sys_enterpriseid': options.sys_enterpriseid,
+			enterprisename: options.enterprisename
+		});
+		this.getList();
+	},
+	/* 默认添加 */
+	created() {
+		wx.redirectTo({
+			url: '/packageA/setclient/modules/contacts/add/index?sys_enterpriseid=' + this.data.content.sys_enterpriseid + "&enterprisename=" + this.data.enterprisename,
+		})
+	},
+	onClick(e) {
+		const {
+			item
+		} = e.currentTarget.dataset;
+		delete(item.tag1)
+		wx.redirectTo({
+			url: `/packageA/setclient/modules/contacts/add/index?sys_enterpriseid=${this.data.content.sys_enterpriseid}&enterprisename=${this.data.enterprisename}&data=${JSON.stringify(item)}`,
+		})
+	},
+	onSearch({
+		detail
+	}) {
+		this.setData({
+			'parems.content.where.condition': detail ? detail : ""
+		});
+		this.getList(true);
+	},
+	onClear() {
+		this.setData({
+			'parems.content.where.condition': ""
+		});
+		this.getList(true);
+	},
+	onReachBottom() {
+		this.getList();
+	},
 })