diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..4f11483
Binary files /dev/null and b/dist.zip differ
diff --git a/src/views/marketing_contract/edit.vue b/src/views/marketing_contract/edit.vue
index 2c4da40..8188c44 100644
--- a/src/views/marketing_contract/edit.vue
+++ b/src/views/marketing_contract/edit.vue
@@ -1,475 +1,699 @@
diff --git a/src/views/marketing_contract/index.vue b/src/views/marketing_contract/index.vue
index 5722fc6..0693f54 100644
--- a/src/views/marketing_contract/index.vue
+++ b/src/views/marketing_contract/index.vue
@@ -107,7 +107,8 @@
-
+
@@ -117,6 +118,7 @@ import { useDictData } from '@/hooks/useDictOptions'
import { apiMarketingContractLists, apiMarketingContractDelete } from '@/api/marketing_contract'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
+import { deptLists } from "@/api/org/department"
import EditPopup from './edit.vue'
const editRef = shallowRef>()
@@ -146,7 +148,7 @@ const handleSelectionChange = (val: any[]) => {
}
// 获取字典数据
-const { dictData } = useDictData('')
+const { dictData } = useDictData('cost_consultation_business_nature,cost_consultation_industry_nature,money_source,const_area,cost_consultation_way,cost_consultation_seal_name,cost_consultation_file_type,isqfgz')
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
@@ -176,6 +178,13 @@ const handleDelete = async (id: number | any[]) => {
getLists()
}
-getLists()
-
+const deptList = ref([])
+const getDeptList = async () => {
+ let res = await deptLists()
+ deptList.value = res.lists
+}
+getLists()
+getDeptList()
+
+
diff --git a/src/views/marketing_framework_agreement/edit.vue b/src/views/marketing_framework_agreement/edit.vue
index 2c4da40..44090d7 100644
--- a/src/views/marketing_framework_agreement/edit.vue
+++ b/src/views/marketing_framework_agreement/edit.vue
@@ -1,137 +1,170 @@
@@ -139,19 +172,21 @@
diff --git a/src/views/marketing_framework_agreement/index.vue b/src/views/marketing_framework_agreement/index.vue
index 34ecb7a..018e17f 100644
--- a/src/views/marketing_framework_agreement/index.vue
+++ b/src/views/marketing_framework_agreement/index.vue
@@ -6,10 +6,12 @@
-
+
-
+
@@ -43,39 +45,6 @@
-
-
+
@@ -105,6 +75,7 @@ import { apimketingFrameworkAgreementLists, apimketingFrameworkAgreementDelete,
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
+import { deptLists } from "@/api/org/department"
const editRef = shallowRef>()
// 是否显示编辑框
@@ -129,7 +100,7 @@ const handleSelectionChange = (val: any[]) => {
}
// 获取字典数据
-const { dictData } = useDictData('')
+const { dictData } = useDictData('isqfgz,agreement_nature,cost_consultation_business_nature,cost_consultation_seal_name,cost_consultation_file_type')
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
@@ -160,6 +131,13 @@ const handleDelete = async (id: number | any[]) => {
getLists()
}
-getLists()
-
+const deptList = ref([])
+const getDeptList = async () => {
+ let res = await deptLists()
+ deptList.value = res.lists
+}
+
+getLists()
+getDeptList()
+
diff --git a/src/views/material/index.vue b/src/views/material/index.vue
index e060f7b..56492b9 100644
--- a/src/views/material/index.vue
+++ b/src/views/material/index.vue
@@ -9,6 +9,15 @@
+
+