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

src/api/admin/user.ts

@@ -142,3 +142,12 @@ export function validatePhone(rule: any, value: any, callback: any, isEdit: bool
 		}
 	})
 }
+
+// 获取简要用户信息
+export function getSimpleUserAll(params: { name?: string; mobile?: string }) {
+	return request({
+		url: "/admin/user/getSimpleUserAll",
+		method: "get",
+		params,
+	})
+}

src/api/supermarketerp/common.ts

@@ -0,0 +1,27 @@
+import request from "/@/utils/request"
+
+// type:1 获取采购计划编号
+// type:2 获取订单编号
+export function getPlanCode(params: { type: 1 | 2 }) {
+	return request({
+		url: "/supermarket/sm/common/getSequence",
+		method: "get",
+		params,
+	})
+}
+
+// 获取erp商品列表
+export function getErpSpuPage() {
+	return request({
+		url: "/supermarket/smErpCgPlan/erpSpuPage",
+		method: "get",
+	})
+}
+
+// 获取简要商品列表
+export function getErpSpuSimpleAll() {
+	return request({
+		url: "/supermarket/supermarketSpu/SimpleAll",
+		method: "get",
+	})
+}

src/api/supermarketerp/smErpCgDd.ts

@@ -1,41 +1,49 @@
 import request from "/@/utils/request"
 
 export function fetchList(query?: Object) {
-  return request({
-    url: '/supermarket/smErpCgDd/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/supermarket/smErpCgDd/page",
+		method: "get",
+		params: query,
+	})
 }
 
 export function addObj(obj?: Object) {
-  return request({
-    url: '/supermarket/smErpCgDd',
-    method: 'post',
-    data: obj
-  })
+	return request({
+		url: "/supermarket/smErpCgDd",
+		method: "post",
+		data: obj,
+	})
 }
 
 export function getObj(id?: string) {
-  return request({
-    url: '/supermarket/smErpCgDd/' + id,
-    method: 'get'
-  })
+	return request({
+		url: "/supermarket/smErpCgDd/" + id,
+		method: "get",
+	})
 }
 
 export function delObjs(ids?: Object) {
-  return request({
-    url: '/supermarket/smErpCgDd',
-    method: 'delete',
-    data: ids
-  })
+	return request({
+		url: "/supermarket/smErpCgDd",
+		method: "delete",
+		data: ids,
+	})
 }
 
 export function putObj(obj?: Object) {
-  return request({
-    url: '/supermarket/smErpCgDd',
-    method: 'put',
-    data: obj
-  })
+	return request({
+		url: "/supermarket/smErpCgDd",
+		method: "put",
+		data: obj,
+	})
 }
 
+// 采购申请单分页查询
+export function getCgsqPage(query?: Object) {
+	return request({
+		url: "/supermarket/smErpCgDd/cgsq/page",
+		method: "get",
+		params: query,
+	})
+}

src/api/supermarketerp/smErpCgPlan.ts

@@ -38,28 +38,3 @@ export function putObj(obj?: Object) {
 		data: obj,
 	})
 }
-
-// 获取采购计划编号
-export function getPlanCode() {
-	return request({
-		url: "/supermarket/sm/common/getSequence",
-		method: "get",
-		params: { type: 1 },
-	})
-}
-
-// 获取采购计划选择商品的列表
-export function getCgPlanSpuPage() {
-	return request({
-		url: "/supermarket/smErpCgPlan/erpSpuPage",
-		method: "get",
-	})
-}
-
-// 获取简要商品列表
-export function getErpSpuSimpleAll() {
-	return request({
-		url: "/supermarket/supermarketSpu/SimpleAll",
-		method: "get",
-	})
-}