同步

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;
 

src/views/main.vue

@@ -186,7 +186,6 @@
 									<span class="f14"> <i class="iconfont icon-shangjiahoutai mr6"></i>商家后台 </span>
 									<i class="iconfont icon-youjiantou c9"></i>
 								</div>
-
 								<a-dropdown :trigger="['click']" class="more-team" :getPopupContainer="(node) => node.parentNode" overlayClassName="setPosition">
 									<span class="fsa more-team-button hover-blue br4" style="padding: 6px 12px" @click.stop>
 										<div class="fss">
@@ -196,7 +195,7 @@
 											</div>
 										</div>
 										<div class="fse">
-											<div class="cf40 esl" style="max-width: 98px">{{ userbaseInfo.agencyName }}</div>
+											<div class="cf40 esl" style="max-width: 98px">{{userbaseInfo.fullName || userbaseInfo.agencyName }}</div>
 											<i class="iconfont icon-youjiantou c9"></i>
 										</div>
 									</span>
@@ -205,9 +204,9 @@
 											<div class="fss">
 												<div>
 													<img v-if="item.logo" class="mr8" :src="item.logo" style="width: 16px; height: 16px" alt="" />
-													<div v-else class="logo mr8">{{ item.agencyName && item.agencyName.charAt(0) }}</div>
+													<div v-else class="logo mr8">{{ item.fullName && item.fullName.charAt(0) }}</div>
 												</div>
-												<div class="tl" style="width: 98px">{{ item.agencyName }}</div>
+												<div class="tl" style="width: 98px">{{ item.fullName || item.agencyName }}</div>
 											</div>
 											<div class="ml12 f12 cf4" v-if="item.checked">当前</div>
 										</div>