Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/api/admin/user.ts

@@ -115,10 +115,10 @@ export function validateUsername(rule: any, value: any, callback: any, isEdit: b
 	if (isEdit) {
 		return callback()
 	}
-	const flag = new RegExp(/^([a-z\d]+?)$/).test(value)
-	if (!flag) {
-		callback(new Error("用户名支持小写英文、数字"))
-	}
+	// const flag = new RegExp(/^([a-z\d]+?)$/).test(value)
+	// if (!flag) {
+	// 	callback(new Error("用户名支持小写英文、数字"))
+	// }
 	getDetails({ username: value }).then((response) => {
 		const result = response.data
 		if (result !== null) {

src/api/flow/task/index.ts

@@ -107,6 +107,15 @@ export function completeTask(param: Object) {
 	})
 }
 
+// 批量完成任务
+export function batchCompleteTask(param: Object) {
+	return request({
+		url: "/task/task/batchCompleteTask",
+		method: "post",
+		data: param,
+	})
+}
+
 // 完成任务
 export function transferTask(param: Object) {
 	return request({

src/api/hard/hard-spu-repertory.ts

@@ -1,8 +1,8 @@
 import request from "/@/utils/request"
 
-export function select(query?: Object) {
+export function pageJoin(query?: Object) {
 	return request({
-		url: "/hard/hard-spu-repertory/select",
+		url: "/hard/hard-spu-repertory/page-join",
 		method: "get",
 		params: query,
 	})

src/api/supermarketerp/smErpSupplier.ts

@@ -40,7 +40,7 @@ export function putObj(obj?: Object) {
 }
 
 // 获取货商下拉列表
-export function getSupplierSimpleAll(params: any): any {
+export function getSupplierSimpleAll(params?: any): any {
 	return request({
 		url: "/supermarket/smErpSupplier/selectSimpleAll",
 		method: "get",