From e348783ec27910461179352cb94a71a17a8923a7 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 12 Dec 2023 11:29:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development.example | 2 +-
src/api/common.ts | 27 +
src/api/org/department.ts | 5 +-
src/api/org/organization.ts | 32 +
src/api/org/post.ts | 2 +-
src/components/budget/index.vue | 71 +
src/components/product/index.vue | 63 +
.../project.vue => project/index.vue} | 90 +-
src/components/reviewprocess/index.vue | 177 +
src/components/statistics/index.vue | 70 +
src/config/index.ts | 2 +-
src/views/bid_bidding_decision/edit.vue | 221 +-
src/views/bid_bidding_decision/index.vue | 56 +-
src/views/bid_buy_bidding_document/edit.vue | 228 +-
src/views/bid_buy_bidding_document/index.vue | 66 +-
src/views/custom/edit.vue | 104 +-
src/views/custom/index.vue | 40 +-
src/views/custom_follow/edit.vue | 15 +-
src/views/custom_follow/index.vue | 55 +-
src/views/custom_service/edit.vue | 35 +-
src/views/custom_service/index.vue | 2 +-
.../Management/addexpense.vue | 128 +
.../Management/adjustmentdetails.vue | 216 +
.../Management/budgetadjustment.vue | 213 +
.../Management/budgetdetails.vue | 215 +
.../Management/costbudget.vue | 234 +
.../Management/editcost.vue | 406 ++
.../Management/expenseaccount.vue | 179 +
.../financialManagement/Management/index.vue | 1 -
src/views/organization/department/edit.vue | 105 +-
src/views/organization/department/index.vue | 85 +-
src/views/organization/organization/edit.vue | 92 +
src/views/organization/organization/index.vue | 97 +
src/views/organization/post/edit.vue | 115 +-
src/views/organization/post/index.vue | 43 +-
src/views/permission/admin/edit.vue | 154 +-
src/views/project/edit.vue | 65 +-
src/views/project/index.vue | 123 +-
src/views/project_follow_up/edit.vue | 58 +-
src/views/project_follow_up/index.vue | 40 +-
src/views/project_pre_sales_members/edit.vue | 339 +-
src/views/project_pre_sales_members/index.vue | 42 +-
src/views/projectmanagement/list/edit.vue | 0
src/views/projectmanagement/list/list.vue | 275 +
src/views/quotation/edit.vue | 278 +-
src/views/quotation/index.vue | 16 +-
yarn.lock | 6242 ++++++++---------
47 files changed, 7084 insertions(+), 4040 deletions(-)
create mode 100644 src/api/org/organization.ts
create mode 100644 src/components/budget/index.vue
create mode 100644 src/components/product/index.vue
rename src/components/{tablieDialog/project.vue => project/index.vue} (53%)
create mode 100644 src/components/reviewprocess/index.vue
create mode 100644 src/components/statistics/index.vue
create mode 100644 src/views/financialManagement/Management/addexpense.vue
create mode 100644 src/views/financialManagement/Management/adjustmentdetails.vue
create mode 100644 src/views/financialManagement/Management/budgetadjustment.vue
create mode 100644 src/views/financialManagement/Management/budgetdetails.vue
create mode 100644 src/views/financialManagement/Management/costbudget.vue
create mode 100644 src/views/financialManagement/Management/editcost.vue
create mode 100644 src/views/financialManagement/Management/expenseaccount.vue
delete mode 100644 src/views/financialManagement/Management/index.vue
create mode 100644 src/views/organization/organization/edit.vue
create mode 100644 src/views/organization/organization/index.vue
create mode 100644 src/views/projectmanagement/list/edit.vue
create mode 100644 src/views/projectmanagement/list/list.vue
diff --git a/.env.development.example b/.env.development.example
index 1a0a607..13bc5f8 100644
--- a/.env.development.example
+++ b/.env.development.example
@@ -1,4 +1,4 @@
NODE_ENV = 'production'
# Base API
-VITE_APP_BASE_URL='http://a.com/'
\ No newline at end of file
+VITE_APP_BASE_URL='https://ceshi-engineering.lihaink.cn'
\ No newline at end of file
diff --git a/src/api/common.ts b/src/api/common.ts
index 78f46fe..f0a1e7c 100644
--- a/src/api/common.ts
+++ b/src/api/common.ts
@@ -11,3 +11,30 @@ export function apiCityList(params: any) {
export function apiAreaList(params: any) {
return request.get({ url: "/common/area", params });
}
+
+
+//获取所有人员
+export function getAdminsByAll(params: any) {
+ return request.get({ url: "/auth.admin/getAdminsByAll", params });
+}
+
+//获取某个部门下的所有人员
+
+export function getAdminsByDept(params: any) {
+ return request.get({ url: "/auth.admin/getAdminsByDept", params });
+}
+
+//获取某个岗位下的所有人员
+export function getAdminsByJob(params: any) {
+ return request.get({ url: "/auth.admin/getAdminsByJob", params });
+}
+
+//获取所有岗位
+export function getAllJobs(params: any) {
+ return request.get({ url: "/dept.jobs/getAllJobs", params });
+}
+
+//获取所有部门
+export function getAllDept(params: any) {
+ return request.get({ url: "/dept.dept/getAllDept", params });
+}
\ No newline at end of file
diff --git a/src/api/org/department.ts b/src/api/org/department.ts
index 3673ed5..bb4930e 100644
--- a/src/api/org/department.ts
+++ b/src/api/org/department.ts
@@ -26,6 +26,7 @@ export function deptDetail(params: any) {
}
// 部门列表全部
-export function deptAll() {
- return request.get({ url: '/dept.dept/all' })
+export function deptAll(params: any) {
+
+ return request.get({ url: '/dept.dept/listToOrg' , params})
}
diff --git a/src/api/org/organization.ts b/src/api/org/organization.ts
new file mode 100644
index 0000000..919da7d
--- /dev/null
+++ b/src/api/org/organization.ts
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+// 组织列表
+export function orgsLists(params?: any) {
+ return request.get({ url: '/dept.orgs/lists', params })
+}
+
+// 添加组织
+export function orgsAdd(params: any) {
+ return request.post({ url: '/dept.orgs/add', params })
+}
+
+// 编辑组织
+export function orgsEdit(params: any) {
+ return request.post({ url: '/dept.orgs/edit', params })
+}
+
+// 删除组织
+export function orgsDelete(params: any) {
+ return request.post({ url: '/dept.orgs/delete', params })
+}
+
+// 组织详情
+export function orgsDetail(params: any) {
+ return request.get({ url: '/dept.orgs/detail', params })
+}
+
+
+// 所有组织
+export function getAll() {
+ return request.get({ url: '/dept.orgs/getAll'})
+}
diff --git a/src/api/org/post.ts b/src/api/org/post.ts
index 4b0f262..2631be5 100644
--- a/src/api/org/post.ts
+++ b/src/api/org/post.ts
@@ -7,7 +7,7 @@ export function jobsLists(params: any) {
// 岗位列表全部
export function jobsAll(params: any) {
- return request.get({ url: '/dept.jobs/all', params })
+ return request.get({ url: '/dept.jobs/listToDept', params })
}
// 添加岗位
diff --git a/src/components/budget/index.vue b/src/components/budget/index.vue
new file mode 100644
index 0000000..7e495fc
--- /dev/null
+++ b/src/components/budget/index.vue
@@ -0,0 +1,71 @@
+
+