diff --git a/.env.development b/.env.development
index 4b62d13..2a54d74 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
NODE_ENV = 'development'
-VITE_APP_BASE_URL = 'http://a.com/'
+VITE_APP_BASE_URL = 'https://ceshi-engineering.lihaink.cn/'
# VITE_APP_BASE_URL = 'http://www.eng.local/'
# VITE_APP_BASE_URL = 'http://192.168.1.5:9090/'
\ No newline at end of file
diff --git a/src/views/consult_project/edit.vue b/src/views/consult_project/edit.vue
index 28ba455..83c6150 100644
--- a/src/views/consult_project/edit.vue
+++ b/src/views/consult_project/edit.vue
@@ -1,496 +1,571 @@
-
diff --git a/src/views/consult_project/index.vue b/src/views/consult_project/index.vue
index a5ba013..5ab3f11 100644
--- a/src/views/consult_project/index.vue
+++ b/src/views/consult_project/index.vue
@@ -70,7 +70,7 @@
-
+
@@ -82,13 +82,15 @@ import { apiConsultProjectLists, apiConsultProjectDelete, apiConsultProjectDetai
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import detailConfig from './detail'
+import {deptLists} from "@/api/org/department";
const editRef = shallowRef>()
const detailRef = ref('')
// 是否显示编辑框
const showEdit = ref(false)
const showDetail = ref(false)
-
+const route = useRoute()
+const router = useRouter()
// 查询条件
@@ -148,6 +150,20 @@ const handleDetail = async (row) => {
detailRef.value?.setFormData(res)
}
+if (route.query.contractId) {
+ handleAdd()
+}
+const success = () => {
+ router.push({
+ path: '/management/manage_basic/manage_project',
+ })
+}
+const deptList = ref([])
+const getDeptList = async () => {
+ const res = await deptLists()
+ deptList.value = res.lists
+}
+getDeptList()
getLists()
diff --git a/src/views/cost_approved_projects/index.vue b/src/views/cost_approved_projects/index.vue
index 8d9263f..43e124a 100644
--- a/src/views/cost_approved_projects/index.vue
+++ b/src/views/cost_approved_projects/index.vue
@@ -100,7 +100,7 @@
-
+
@@ -183,6 +183,24 @@ const link = (data: any) => {
}
})
break
+ case '2':
+ router.push({
+ path: '/management/manage_basic/manage_project',
+ query: {
+ contractId: data.id,
+ contractName: data.contract_name
+ }
+ })
+ break
+ case '3':
+ router.push({
+ path: '/consult/consult_basic/consult_project',
+ query: {
+ contractId: data.id,
+ contractName: data.contract_name
+ }
+ })
+ break
case '4':
router.push({
path: '/cost_consultation/cost_consultation_project/cost_project',
diff --git a/src/views/manage_project/edit.vue b/src/views/manage_project/edit.vue
index 3f37943..0c18c13 100644
--- a/src/views/manage_project/edit.vue
+++ b/src/views/manage_project/edit.vue
@@ -1,480 +1,555 @@
-
diff --git a/src/views/manage_project/index.vue b/src/views/manage_project/index.vue
index 697f3f8..d3b2180 100644
--- a/src/views/manage_project/index.vue
+++ b/src/views/manage_project/index.vue
@@ -114,7 +114,7 @@
-
+
@@ -127,7 +127,10 @@ import { apiManageProjectLists, apiManageProjectDelete, apiManageProjectDetail }
import detailConfig from './detail'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
+import {deptLists} from "@/api/org/department";
+const route = useRoute()
+const router = useRouter()
const editRef = shallowRef>()
const detailRef = ref('')
// 是否显示编辑框
@@ -194,7 +197,20 @@ const handleDetail = async (id: any) => {
detailRef.value?.open()
detailRef.value?.setFormData(res)
}
+if (route.query.contractId) {
+ handleAdd()
+}
+const success = () => {
+ router.push({
+ path: '/management/manage_basic/manage_project',
-
+ })
+}
+const deptList = ref([])
+const getDeptList = async () => {
+ const res = await deptLists()
+ deptList.value = res.lists
+}
+getDeptList()
getLists()
diff --git a/src/views/supervision_project/index.vue b/src/views/supervision_project/index.vue
index f10ca86..80ebb25 100644
--- a/src/views/supervision_project/index.vue
+++ b/src/views/supervision_project/index.vue
@@ -244,7 +244,6 @@ const success = () => {
path: '/supervision/supervision_basic/supervision_project',
})
-
}
getLists()
getDeptList()