diff --git a/src/api/financial_budget_doc.ts b/src/api/financial_budget_doc.ts index 303bbee..3436f70 100644 --- a/src/api/financial_budget_doc.ts +++ b/src/api/financial_budget_doc.ts @@ -1,26 +1,34 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 财务管理--项目预算书列表 export function apiFinancialBudgetDocLists(params: any) { - return request.get({ url: '/financial.financial_budget_doc/lists', params }) + return request.get({ url: "/financial.financial_budget_doc/lists", params }); } // 添加财务管理--项目预算书 export function apiFinancialBudgetDocAdd(params: any) { - return request.post({ url: '/financial.financial_budget_doc/add', params }) + return request.post({ url: "/financial.financial_budget_doc/add", params }); } // 编辑财务管理--项目预算书 export function apiFinancialBudgetDocEdit(params: any) { - return request.post({ url: '/financial.financial_budget_doc/edit', params }) + return request.post({ url: "/financial.financial_budget_doc/edit", params }); } // 删除财务管理--项目预算书 export function apiFinancialBudgetDocDelete(params: any) { - return request.post({ url: '/financial.financial_budget_doc/delete', params }) + return request.post({ + url: "/financial.financial_budget_doc/delete", + params, + }); } // 财务管理--项目预算书详情 export function apiFinancialBudgetDocDetail(params: any) { - return request.get({ url: '/financial.financial_budget_doc/detail', params }) -} \ No newline at end of file + return request.get({ url: "/financial.financial_budget_doc/detail", params }); +} + +// 财务管理--项目预算书 +export function apiFinancialBudgetDocSearch(params: any) { + return request.get({ url: "/financial.financial_budget_doc/datas", params }); +} diff --git a/src/api/financial_department_income_settlement.ts b/src/api/financial_department_income_settlement.ts new file mode 100644 index 0000000..d615653 --- /dev/null +++ b/src/api/financial_department_income_settlement.ts @@ -0,0 +1,58 @@ +import request from "@/utils/request"; + +// 财务管理--部门收入结算列表 +export function apiFinancialDepartmentIncomeSettlementLists(params: any) { + return request.get({ + url: "/financial.financial_department_income_settlement/lists", + params, + }); +} + +// 添加财务管理--部门收入结算 +export function apiFinancialDepartmentIncomeSettlementAdd(params: any) { + return request.post({ + url: "/financial.financial_department_income_settlement/add", + params, + }); +} + +// 编辑财务管理--部门收入结算 +export function apiFinancialDepartmentIncomeSettlementEdit(params: any) { + return request.post({ + url: "/financial.financial_department_income_settlement/edit", + params, + }); +} + +// 删除财务管理--部门收入结算 +export function apiFinancialDepartmentIncomeSettlementDelete(params: any) { + return request.post({ + url: "/financial.financial_department_income_settlement/delete", + params, + }); +} + +// 财务管理--部门收入结算详情 +export function apiFinancialDepartmentIncomeSettlementDetail(params: any) { + return request.get({ + url: "/financial.financial_department_income_settlement/detail", + params, + }); +} +// 财务管理--部门收入结算列表 +export function apiFinancialDepartmentIncomeSettlementDetailLists(params: any) { + return request.get({ + url: "/financial.financial_department_income_settlement_detail/lists", + params, + }); +} + +// 删除财务管理--部门收入结算 +export function apiFinancialDepartmentIncomeSettlementDetailDelete( + params: any +) { + return request.post({ + url: "/financial.financial_department_income_settlement_detail/delete", + params, + }); +} diff --git a/src/components/createUserLable/index.vue b/src/components/createUserLable/index.vue index 0067d9e..59b9895 100644 --- a/src/components/createUserLable/index.vue +++ b/src/components/createUserLable/index.vue @@ -1,5 +1,4 @@ - @@ -13,11 +12,11 @@ - + - + @@ -33,7 +32,11 @@ import useUserStore from "@/stores/modules/user"; let props = defineProps({ flag: Boolean, - formData: Object + formData: Object, + name: { + default: "创建", + type: String + } }) const userStore = useUserStore().userInfo; diff --git a/src/components/dialogTable/dialogTableConfig.ts b/src/components/dialogTable/dialogTableConfig.ts index ce5e949..3fbba90 100644 --- a/src/components/dialogTable/dialogTableConfig.ts +++ b/src/components/dialogTable/dialogTableConfig.ts @@ -584,3 +584,26 @@ export const financial_invoice: Iconfig = { { refund_amount: "到账金额" }, ], }; + +import { apiFinancialBudgetDocLists } from "@/api/financial_budget_doc"; + +export const financial_budget_doc: Iconfig = { + fetchFn: apiFinancialBudgetDocLists, + serchList: [ + { + label: "预算书编号", + value: "code", + }, + { + label: "预算书名称", + value: "name", + }, + ], + tableList: [ + { contract_name: "合同名称" }, + { total_amount: "合同金额" }, + { code: "预算书编号" }, + { name: "预算书名称" }, + { issue_date: "下达日期" }, + ], +}; diff --git a/src/components/formTable/index.vue b/src/components/formTable/index.vue index 3192d4a..362267f 100644 --- a/src/components/formTable/index.vue +++ b/src/components/formTable/index.vue @@ -10,6 +10,9 @@ - + + + diff --git a/src/components/popup/index.vue b/src/components/popup/index.vue index 278009a..2dd3a83 100644 --- a/src/components/popup/index.vue +++ b/src/components/popup/index.vue @@ -67,7 +67,7 @@ export default defineComponent({ clickModalClose: { // 点击遮罩层关闭对话窗口 type: Boolean, - default: false + default: true }, center: { // 是否居中布局 diff --git a/src/install/directives/type.ts b/src/install/directives/type.ts new file mode 100644 index 0000000..fff3432 --- /dev/null +++ b/src/install/directives/type.ts @@ -0,0 +1,20 @@ +/** + * perm 操作权限处理 + * 指令用法: + * 编辑 + * 文本输入框code为编号输入框,unit为单位输入框 + */ + +export default { + mounted: async (el: HTMLElement, binding: any) => { + var inputElements = el.getElementsByTagName("input")[0]; + var { value } = binding; + inputElements.addEventListener("input", function (event) { + if (value == "code") { + event.target.value = event.target.value.replace(/[\u4e00-\u9fa5]/g, ""); + } else if (value == "unit") { + event.target.value = event.target.value.replace(/\d+/g, ""); + } + }); + }, +}; diff --git a/src/utils/validate.ts b/src/utils/validate.ts index bc512bb..270da7b 100644 --- a/src/utils/validate.ts +++ b/src/utils/validate.ts @@ -3,21 +3,44 @@ * @returns {Boolean} */ export function isExternal(path: string) { - return /^(https?:|mailto:|tel:)/.test(path) + return /^(https?:|mailto:|tel:)/.test(path); } //电话 export function isPhone(data: string) { - return /^1[3|4|5|7|8][0-9]{9}$/.test(data) + return /^1[3|4|5|7|8][0-9]{9}$/.test(data); } //身份号 -export function isIdCard(data: string ){ - return /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(data) +export function isIdCard(data: string) { + return /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(data); } //邮箱 export function isEmail(data: string) { - return /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(data) + return /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(data); } +// input框校验 +//电话 +export function checkPhone(rules: any, value: any, callback: any) { + /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test( + value + ) + ? callback() + : callback(new Error("请输入正确的手机号")); +} + +//邮箱 +export function checkEmail(rules: any, value: any, callback: any) { + /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(value) + ? callback() + : callback(new Error("请输入正确的邮箱")); +} + +//邮箱 +export function checkIdcard(rules: any, value: any, callback: any) { + /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(value) + ? callback() + : callback(new Error("请输入正确的身份证号码")); +} diff --git a/src/views/cost_approved_projects/edit.vue b/src/views/cost_approved_projects/edit.vue index a57e2d6..6174b7d 100644 --- a/src/views/cost_approved_projects/edit.vue +++ b/src/views/cost_approved_projects/edit.vue @@ -10,8 +10,7 @@ - + @@ -272,8 +271,7 @@ - + diff --git a/src/views/financial_department_income_settlement/detail.js b/src/views/financial_department_income_settlement/detail.js new file mode 100644 index 0000000..117972c --- /dev/null +++ b/src/views/financial_department_income_settlement/detail.js @@ -0,0 +1,56 @@ +import { + apiFinancialDepartmentIncomeSettlementDetailLists, +} from '@/api/financial_department_income_settlement' + +const detailConfig = { + title: "财务管理--部门收入结算", + config: [ + { + label: "项目预算书", + value: "name" + }, + { + label: "结算说明", + value: "desc" + }, + { + label: "结算人", + value: "create_user" + }, + { + label: "结算日期", + value: "create_time" + }, + ], + table: { + title: "结算明细", + tableConfig: [ + { + label: "部门", + value: 'dept_name', + + }, + { + label: "预算分成方式", + value: 'type_text' + }, + { + label: "预算分成金额", + value: 'settlement_amount', + }, + { + label: "结算单号", + value: 'settlement_code', + }, + { + label: "备注", + value: 'remark', + }, + + ], + fetchFun: apiFinancialDepartmentIncomeSettlementDetailLists, + query: "department_income_settlement_id" + } + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/financial_department_income_settlement/edit.vue b/src/views/financial_department_income_settlement/edit.vue new file mode 100644 index 0000000..0f6c053 --- /dev/null +++ b/src/views/financial_department_income_settlement/edit.vue @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/financial_department_income_settlement/index.vue b/src/views/financial_department_income_settlement/index.vue new file mode 100644 index 0000000..1d85aea --- /dev/null +++ b/src/views/financial_department_income_settlement/index.vue @@ -0,0 +1,142 @@ + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + 新增 + + + 删除 + + + + + + + + + + + + + + + 编辑 + + + 删除 + + + 详情 + + + + + + + + + + + + + + + + + diff --git a/src/views/manage_accept_doc/edit.vue b/src/views/manage_accept_doc/edit.vue index b49dfed..9063588 100644 --- a/src/views/manage_accept_doc/edit.vue +++ b/src/views/manage_accept_doc/edit.vue @@ -1,15 +1,15 @@ - + - + + @@ -32,7 +32,7 @@ - + diff --git a/src/views/manage_company/edit.vue b/src/views/manage_company/edit.vue index 0312a26..91546eb 100644 --- a/src/views/manage_company/edit.vue +++ b/src/views/manage_company/edit.vue @@ -1,7 +1,6 @@ - + @@ -54,6 +53,8 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiManageCompanyAdd, apiManageCompanyEdit, apiManageCompanyDetail, apimanage_company_contacts, apimanage_company_contacts_delete } from '@/api/manage_company' import { manage_project } from "@/components/dialogTable/dialogTableConfig" +import { checkPhone } from "@/utils/validate" + import type { PropType } from 'vue' defineProps({ dictData: { @@ -151,11 +152,18 @@ const formRules = reactive({ message: '请输入资质等级', trigger: ['blur'] }], - telephone: [{ - required: true, - message: '请输入联系电话', - trigger: ['blur'] - }], + telephone: [ + + { + required: true, + message: '请输入联系电话', + trigger: ['blur'] + }, + { + validator: checkPhone, + trigger: ['blur'] + } + ], duty: [{ required: true, message: '请输入责任范围', diff --git a/src/views/manage_company/index.vue b/src/views/manage_company/index.vue index c295351..6b49b28 100644 --- a/src/views/manage_company/index.vue +++ b/src/views/manage_company/index.vue @@ -15,8 +15,7 @@ - + @@ -57,8 +56,7 @@ @click="handleDelete(row.id)"> 删除 - + 详情 @@ -70,8 +68,7 @@ - + diff --git a/src/views/manage_engineering_changes/edit.vue b/src/views/manage_engineering_changes/edit.vue index 07a998f..1ad6995 100644 --- a/src/views/manage_engineering_changes/edit.vue +++ b/src/views/manage_engineering_changes/edit.vue @@ -1,7 +1,6 @@ - + - + diff --git a/src/views/manage_metered_payment/edit.vue b/src/views/manage_metered_payment/edit.vue index 0cc4dce..e30e0b0 100644 --- a/src/views/manage_metered_payment/edit.vue +++ b/src/views/manage_metered_payment/edit.vue @@ -1,8 +1,7 @@ - - + + @@ -18,7 +17,7 @@ - + diff --git a/src/views/manage_monthly_progress_report/edit.vue b/src/views/manage_monthly_progress_report/edit.vue index 98e668e..bdf9485 100644 --- a/src/views/manage_monthly_progress_report/edit.vue +++ b/src/views/manage_monthly_progress_report/edit.vue @@ -1,7 +1,6 @@ - + - + diff --git a/src/views/manage_project/edit.vue b/src/views/manage_project/edit.vue index 5dd1f5f..1700356 100644 --- a/src/views/manage_project/edit.vue +++ b/src/views/manage_project/edit.vue @@ -1,7 +1,6 @@ - + @@ -12,8 +11,8 @@ - + @@ -53,14 +52,12 @@ - + - + @@ -85,29 +82,29 @@ - + - + - + - + @@ -128,8 +125,8 @@ - + @@ -162,8 +159,8 @@ - + diff --git a/src/views/manage_project/index.vue b/src/views/manage_project/index.vue index 908bed5..73f4288 100644 --- a/src/views/manage_project/index.vue +++ b/src/views/manage_project/index.vue @@ -17,8 +17,8 @@ - + @@ -40,8 +40,7 @@ - + @@ -79,19 +78,21 @@ - - + + - + - + @@ -101,8 +102,7 @@ @click="handleDelete(row.id)"> 删除 - + 详情 @@ -154,7 +154,7 @@ const handleSelectionChange = (val: any[]) => { } // 获取字典数据 -const { dictData } = useDictData('cost_consultation_industry_nature,industry,const_area,supervision_project_level,engineering_status') +const { dictData } = useDictData('supervision_project_nature,industry,const_area,supervision_project_level,engineering_status') // 分页相关 const { pager, getLists, resetParams, resetPage } = usePaging({ diff --git a/src/views/manage_send_doc/edit.vue b/src/views/manage_send_doc/edit.vue index eace011..b917abb 100644 --- a/src/views/manage_send_doc/edit.vue +++ b/src/views/manage_send_doc/edit.vue @@ -1,14 +1,13 @@ - + - + @@ -27,7 +26,7 @@ - + diff --git a/src/views/project_cost_budget/edit.vue b/src/views/project_cost_budget/edit.vue index 2aa1459..c2e70d1 100644 --- a/src/views/project_cost_budget/edit.vue +++ b/src/views/project_cost_budget/edit.vue @@ -57,7 +57,7 @@ - + diff --git a/src/views/project_equipment_budget/edit.vue b/src/views/project_equipment_budget/edit.vue index e85d432..af2d605 100644 --- a/src/views/project_equipment_budget/edit.vue +++ b/src/views/project_equipment_budget/edit.vue @@ -71,7 +71,7 @@ - + diff --git a/src/views/project_insurance_management/edit.vue b/src/views/project_insurance_management/edit.vue index acd50a0..b79eb73 100644 --- a/src/views/project_insurance_management/edit.vue +++ b/src/views/project_insurance_management/edit.vue @@ -44,8 +44,7 @@ - + @@ -67,8 +66,7 @@ - + diff --git a/src/views/project_labor_budget/edit.vue b/src/views/project_labor_budget/edit.vue index b6b1bcb..cc3e3dc 100644 --- a/src/views/project_labor_budget/edit.vue +++ b/src/views/project_labor_budget/edit.vue @@ -60,7 +60,7 @@ - + diff --git a/src/views/project_subpackage_budget/edit.vue b/src/views/project_subpackage_budget/edit.vue index 28f8768..edd0385 100644 --- a/src/views/project_subpackage_budget/edit.vue +++ b/src/views/project_subpackage_budget/edit.vue @@ -58,7 +58,7 @@ - + diff --git a/src/views/supervision_check_item/edit.vue b/src/views/supervision_check_item/edit.vue index 9bb18ec..263e9d4 100644 --- a/src/views/supervision_check_item/edit.vue +++ b/src/views/supervision_check_item/edit.vue @@ -26,8 +26,7 @@ - + diff --git a/src/views/supervision_construction_management_personnel/edit.vue b/src/views/supervision_construction_management_personnel/edit.vue index 8d1f950..e5eacf4 100644 --- a/src/views/supervision_construction_management_personnel/edit.vue +++ b/src/views/supervision_construction_management_personnel/edit.vue @@ -44,7 +44,7 @@ + v-type="'code'" /> @@ -74,8 +74,7 @@ - + @@ -85,7 +84,8 @@ - + diff --git a/src/views/supervision_device_entry/edit.vue b/src/views/supervision_device_entry/edit.vue index ac5547a..d384d7f 100644 --- a/src/views/supervision_device_entry/edit.vue +++ b/src/views/supervision_device_entry/edit.vue @@ -91,7 +91,7 @@ - + diff --git a/src/views/supervision_large_equipment/edit.vue b/src/views/supervision_large_equipment/edit.vue index c2ad2f8..86063bf 100644 --- a/src/views/supervision_large_equipment/edit.vue +++ b/src/views/supervision_large_equipment/edit.vue @@ -28,7 +28,7 @@ + v-type="'code'" /> @@ -69,7 +69,7 @@ + v-type="'code'" /> diff --git a/src/views/supervision_large_mechanical_equipment/edit.vue b/src/views/supervision_large_mechanical_equipment/edit.vue index 7c58df3..153128b 100644 --- a/src/views/supervision_large_mechanical_equipment/edit.vue +++ b/src/views/supervision_large_mechanical_equipment/edit.vue @@ -52,7 +52,7 @@ + v-type="'code'" /> diff --git a/src/views/supervision_material_equipment_info/edit.vue b/src/views/supervision_material_equipment_info/edit.vue index 7b37e40..77b4adf 100644 --- a/src/views/supervision_material_equipment_info/edit.vue +++ b/src/views/supervision_material_equipment_info/edit.vue @@ -16,8 +16,7 @@ - + diff --git a/src/views/supervision_participating_units_qualifications/edit.vue b/src/views/supervision_participating_units_qualifications/edit.vue index 5b17b65..5859a58 100644 --- a/src/views/supervision_participating_units_qualifications/edit.vue +++ b/src/views/supervision_participating_units_qualifications/edit.vue @@ -14,8 +14,7 @@ - + - + - + diff --git a/src/views/supervision_project_monthly_report/edit.vue b/src/views/supervision_project_monthly_report/edit.vue index ee7ecf8..e37b055 100644 --- a/src/views/supervision_project_monthly_report/edit.vue +++ b/src/views/supervision_project_monthly_report/edit.vue @@ -1,8 +1,7 @@ - - + + @@ -19,14 +18,14 @@ - + - + @@ -37,8 +36,7 @@ - + @@ -62,14 +60,12 @@ - + - + diff --git a/src/views/supervision_project_monthly_report/index.vue b/src/views/supervision_project_monthly_report/index.vue index bcbbdd1..2100613 100644 --- a/src/views/supervision_project_monthly_report/index.vue +++ b/src/views/supervision_project_monthly_report/index.vue @@ -37,27 +37,27 @@ - + - - - + + + - - - - - - - - - - - + + + + + + + + + + -