diff --git a/src/components/dialogTable/dialogTableConfig.ts b/src/components/dialogTable/dialogTableConfig.ts index dfe8486..dd4685a 100644 --- a/src/components/dialogTable/dialogTableConfig.ts +++ b/src/components/dialogTable/dialogTableConfig.ts @@ -291,22 +291,19 @@ export const cost_approved_projects: Iconfig = { }, { label: "合同编号", - value: "contract_num", + value: "contract_code", }, ], tableList: [ - { contract_num: "合同编号" }, + { contract_code: "合同编号" }, { contract_name: "合同名称" }, - { part_a: "甲方签约单位" }, - { part_b: "乙方签约单位" }, - { start_date: "合同计划开始日期" }, - { end_date: "合同计划结束日期" }, - { project_money: "工程总投资" }, + { contract_type_text: "合同类型" }, + { part_a_name: "甲方单位" }, + { part_b: "乙方单位" }, + { project_money: "工程投资" }, + { signed_amount: "签订金额" }, + { signed_dept_name: "签订部门" }, { business_nature_text: "业务性质" }, - { dept: "签订部门" }, - { fund_sources_text: "资金来源" }, - { project_director: "项目总监" }, - { regulators: "监管部门" }, ], }; diff --git a/src/components/procurement/index.vue b/src/components/procurement/index.vue index 56b1661..7b31c04 100644 --- a/src/components/procurement/index.vue +++ b/src/components/procurement/index.vue @@ -43,7 +43,7 @@ - + diff --git a/src/hooks/usePaging.ts b/src/hooks/usePaging.ts index 9bb5b2b..4685772 100644 --- a/src/hooks/usePaging.ts +++ b/src/hooks/usePaging.ts @@ -51,7 +51,7 @@ export function usePaging(options: Options) { calcWidth: ({ column }: Icolumn) => { if (!pager.lists?.length) return column.label; - let propWidth = column.label.length * 14 + 26; + let propWidth = column.label.length * 14 + 27; let list = pager.lists.map( (item: Object) => (item as any)[column.property] ); diff --git a/src/install/directives/copy.ts b/src/install/directives/copy.ts index c0b1909..33e484c 100644 --- a/src/install/directives/copy.ts +++ b/src/install/directives/copy.ts @@ -4,25 +4,25 @@ * 编辑 */ -import feedback from '@/utils/feedback' -import useClipboard from 'vue-clipboard3' -const clipboard = 'data-clipboard-text' +import feedback from "@/utils/feedback"; +import useClipboard from "vue-clipboard3"; +const clipboard = "data-clipboard-text"; export default { - mounted: (el: HTMLElement, binding: any) => { - el.setAttribute(clipboard, binding.value) - const { toClipboard } = useClipboard() + mounted: (el: HTMLElement, binding: any) => { + el.setAttribute(clipboard, binding.value); + const { toClipboard } = useClipboard(); - el.onclick = () => { - toClipboard(el.getAttribute(clipboard)!) - .then(() => { - feedback.msgSuccess('复制成功') - }) - .catch(() => { - feedback.msgError('复制失败') - }) - } - }, - updated: (el: HTMLElement, binding: any) => { - el.setAttribute(clipboard, binding.value) - } -} + el.onclick = () => { + toClipboard(el.getAttribute(clipboard)!) + .then(() => { + feedback.msgSuccess("复制成功"); + }) + .catch(() => { + feedback.msgError("复制失败"); + }); + }; + }, + updated: (el: HTMLElement, binding: any) => { + el.setAttribute(clipboard, binding.value); + }, +}; diff --git a/src/install/directives/type.ts b/src/install/directives/type.ts index fff3432..767a2ec 100644 --- a/src/install/directives/type.ts +++ b/src/install/directives/type.ts @@ -7,6 +7,7 @@ export default { mounted: async (el: HTMLElement, binding: any) => { + console.log(el, "el"); var inputElements = el.getElementsByTagName("input")[0]; var { value } = binding; inputElements.addEventListener("input", function (event) { diff --git a/src/views/administrative_payments/edit.vue b/src/views/administrative_payments/edit.vue index 8c7a379..55d37bb 100644 --- a/src/views/administrative_payments/edit.vue +++ b/src/views/administrative_payments/edit.vue @@ -74,8 +74,8 @@ - - + + diff --git a/src/views/administrative_payments/index.vue b/src/views/administrative_payments/index.vue index 8a87033..c84db85 100644 --- a/src/views/administrative_payments/index.vue +++ b/src/views/administrative_payments/index.vue @@ -46,7 +46,7 @@ - + diff --git a/src/views/apply_with_seal/edit.vue b/src/views/apply_with_seal/edit.vue index 407ea69..87b2c2b 100644 --- a/src/views/apply_with_seal/edit.vue +++ b/src/views/apply_with_seal/edit.vue @@ -24,8 +24,6 @@ - - @@ -45,14 +43,12 @@ - - - + - - - - + - - - @@ -116,8 +107,6 @@ - - @@ -130,15 +119,12 @@ - - - - - @@ -188,15 +172,14 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiApplyWithSealAdd, apiApplyWithSealEdit, apiApplyWithSealDetail } from '@/api/apply_with_seal' -import { deptAll } from '@/api/org/department' -import { getAll } from '@/api/org/organization' import { cost_project } from "@/components/dialogTable/dialogTableConfig" import type { PropType } from 'vue' defineProps({ dictData: { type: Object as PropType>, default: () => ({}) - } + }, + deptList: Array }) const emit = defineEmits(['success', 'close']) const formRef = shallowRef() @@ -205,8 +188,7 @@ const mode = ref('add') const showDialog = ref(false) const showDialog3 = ref(false) const personnel = ref() -const list1 = reactive([]) -const list2 = reactive([]) + // 弹窗标题 const popupTitle = computed(() => { @@ -246,10 +228,9 @@ const formData = reactive({ }) const customEvent = (e: any) => { - console.log(e, 'e') formData.project_id = e.id formData.project_name = e.project_name - formData.project_director = e.contract.project_director + formData.project_director = e.principal_name showDialog.value = false } @@ -318,29 +299,10 @@ const setFormData = async (data: Record) => { formData.project_id = formData.projectInfo.id formData.project_name = formData.projectInfo.project_name formData.principal = formData.projectInfo.principal - getlist1(formData.depar) } -//获取所有组织 -const getlist = () => { - getAll().then((res) => { - Object.assign(list1, res) - }) -} -//获取部门 -const deptrmt = (e: any) => { - formData.depar = '' - getlist1(e) - -} -//获取所有部门 -const getlist1 = (id: any) => { - deptAll({ 'org_id': id }).then((res) => { - list2.splice(0, list2.length, ...res) - }) -} const getDetail = async (row: Record) => { const data = await apiApplyWithSealDetail({ id: row.id @@ -364,7 +326,6 @@ const handleSubmit = async () => { const open = (type = 'add') => { mode.value = type popupRef.value?.open() - getlist() } diff --git a/src/views/apply_with_seal/index.vue b/src/views/apply_with_seal/index.vue index ca32626..f09bdb7 100644 --- a/src/views/apply_with_seal/index.vue +++ b/src/views/apply_with_seal/index.vue @@ -37,40 +37,48 @@
- - - + + + - + - + - - - - - - - + + + + + + + - - - - - - + + + + + + @@ -107,6 +116,7 @@ import feedback from '@/utils/feedback' import EditPopup from './edit.vue' import { apiCostProjectDatas } from "@/api/cost_project"; import detailConfig from './detail' +import { deptLists } from "@/api/org/department" const editRef = shallowRef>() const detailRef = ref('') @@ -171,6 +181,12 @@ const handleDetail = async (row) => { detailRef.value?.setFormData(res) } +const deptList = ref([]) +const getDeptList = async () => { + let res = await deptLists() + deptList.value = res.lists +} getLists() +getDeptList() diff --git a/src/views/approval_issuance_achievement_documents/index.vue b/src/views/approval_issuance_achievement_documents/index.vue index 425a899..a2c9f38 100644 --- a/src/views/approval_issuance_achievement_documents/index.vue +++ b/src/views/approval_issuance_achievement_documents/index.vue @@ -38,20 +38,22 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + diff --git a/src/views/data_report_commission/index.vue b/src/views/data_report_commission/index.vue index 96a2708..db6dc05 100644 --- a/src/views/data_report_commission/index.vue +++ b/src/views/data_report_commission/index.vue @@ -65,7 +65,7 @@ - +