Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/views/audit/distributor/index.vue

@@ -422,7 +422,6 @@
 						return this.$message.warning('请输入正确联系电话');
 					}
 				}
-				console.log(1)
 				if (!query.telephone) query.telephone = null;
 				if (!query.phonenum) query.phonenum = null;
 				let loading = this.$loading({ target: '.main-container' });

src/views/audit/manufacturer/index.vue

@@ -418,8 +418,10 @@
 				// let reg2 = /^0\d{2,3}-\d{7,8}$/;
 				if (query.telephone && !reg.test(query.telephone)) return this.$message.warning('请输入正确手机号码');
 				// if (query.phonenum && !reg2.test(query.phonenum)) return this.$message.warning('请输入正确联系电话');
-				if (query.phonenum.length>20 || query.phonenum[0]==' ') {
-					return this.$message.warning('请输入正确联系电话');
+				if(query.phonenum){
+					if (query.phonenum.length>20 || query.phonenum[0]==' ') {
+						return this.$message.warning('请输入正确联系电话');
+					}
 				}
 				if (!query.telephone) query.telephone = null;
 				if (!query.phonenum) query.phonenum = null;

src/views/audit/productManagement/index.vue

@@ -1263,7 +1263,7 @@
 						if (res.code === 200) {
 							this.isShow = 'home';
 							// (this as any).$refs.sideTree.request();
-							(this as any).$refs.sideTree.setData(data);
+							this.getTreeList();
 							this.getDataList();
 							this.$message.success('保存成功');
 						}
@@ -1274,7 +1274,7 @@
 						if (res.code === 200) {
 							this.isShow = 'home';
 							// (this as any).$refs.sideTree.request();
-							(this as any).$refs.sideTree.setData(data);
+							this.getTreeList();
 							this.getDataList();
 							this.$message.success('保存成功');
 						}
@@ -1956,7 +1956,7 @@
 						this.$message.success('删除成功');
 						this.isShow = 'home';
 						// (this as any).$refs.sideTree.request();
-						(this as any).$refs.sideTree.setData(data);
+						this.getTreeList();
 						this.getDataList();
 					} else this.$message.error(res.msg);
 				}).catch(() => {});
@@ -1981,7 +1981,7 @@
 				other.deleteSpuAndSku({ ids: ids }, 'maindataMaterial').then((res : any) => {
 					if (res.code === 200) {
 						// (this as any).$refs.sideTree.request();
-						(this as any).$refs.sideTree.setData(data);
+						this.getTreeList();
 						this.getDataList();
 						this.$message.success('删除成功');
 					} else this.$message.error(res.msg);
@@ -1999,7 +1999,7 @@
 				other.deleteSpuAndSku({ ids: item.id }, 'maindataMaterial').then((res : any) => {
 					if (res.code === 200) {
 						// (this as any).$refs.sideTree.request();
-						(this as any).$refs.sideTree.setData(data);
+						this.getTreeList();
 						this.getDataList();
 						this.$message.success('删除成功');
 					} else this.$message.error(res.msg);
@@ -2010,7 +2010,7 @@
 		onRefresh() {
 			(this as any).$refs.moduleView.clearSearch();
 			// (this as any).$refs.sideTree.request();
-			(this as any).$refs.sideTree.setData(data);
+			this.getTreeList();
 			this.categoryIds = '';
 			this.getDataList();
 		}

src/views/audit/supplier/index.vue

@@ -415,8 +415,10 @@
 				// let reg2 = /^0\d{2,3}-\d{7,8}$/;
 				if (query.telephone && !reg.test(query.telephone)) return this.$message.warning('请输入正确手机号码');
 				// if (query.phonenum && !reg2.test(query.phonenum)) return this.$message.warning('请输入正确联系电话');
-				if (query.phonenum.length>20 || query.phonenum[0]==' ') {
-					return this.$message.warning('请输入正确联系电话');
+				if(query.phonenum){
+					if (query.phonenum.length>20 || query.phonenum[0]==' ') {
+						return this.$message.warning('请输入正确联系电话');
+					}
 				}
 				if (!query.telephone) query.telephone = null;
 				if (!query.phonenum) query.phonenum = null;