diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue index bbcebb6..2a4efd5 100644 --- a/src/components/FirstJob/recordBill.vue +++ b/src/components/FirstJob/recordBill.vue @@ -386,7 +386,7 @@ export default { { min: 18, max: 18, - pattern: /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, + pattern: /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, message: "请输入正确的身份证号", trigger: "submit", }, @@ -692,7 +692,7 @@ export default { if (ispass) { console.log(this.form); this.form["imgs"] = that.fileListT2.toString(); - this.form["agencyId"] =this.proxyinfo.agencyId + this.form["agencyId"] = this.proxyinfo.agencyId; if (this.currentPolicy == 0) { this.$message.warning("请选择政策"); this.confirmLoading = false; @@ -713,9 +713,6 @@ export default { this.form["agencyUserId"] = this.proxyinfo.id; this.form["idCard"] = this.form["idCard"].replace(/\s+/g, ""); - - - dataObj = qs.stringify({ ...this.form, storeJobId: this.firminfo.id, @@ -724,8 +721,7 @@ export default { }); data = await recordBillApiDaotian(dataObj); } else { - - this.form["idCard"] = this.form["idCard"].replace(/\s+/g, ""); + this.form["idCard"] = this.form["idCard"].replace(/\s+/g, ""); dataObj = qs.stringify({ ...this.form, @@ -738,14 +734,14 @@ export default { } console.log("data handleOk", data); if (data.data.status === 200) { - setTimeout(() => { - + // setTimeout(() => { this.$router.push("/recordsuccess"); // this.confirmLoading = false; - - }, 1000); + // }, 1000); } else { this.$message.error(data.data.msg); + + this.confirmLoading = false; } // this.confirmLoading = false; diff --git a/src/views/main.vue b/src/views/main.vue index 1478036..04f9cbb 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -186,7 +186,6 @@ 商家后台 -
@@ -196,7 +195,7 @@
-
{{ userbaseInfo.agencyName }}
+
{{userbaseInfo.fullName || userbaseInfo.agencyName }}
@@ -205,9 +204,9 @@
- +
-
{{ item.agencyName }}
+
{{ item.fullName || item.agencyName }}
当前