diff --git a/src/components/formTable/index.vue b/src/components/formTable/index.vue index 27d5f97..7d7c61c 100644 --- a/src/components/formTable/index.vue +++ b/src/components/formTable/index.vue @@ -11,7 +11,6 @@ + - - @@ -28,7 +27,10 @@ - + diff --git a/src/components/icon/picker.vue b/src/components/icon/picker.vue index 27fc8cd..189133e 100644 --- a/src/components/icon/picker.vue +++ b/src/components/icon/picker.vue @@ -1,27 +1,15 @@ - - + + 请选择图标 - + }" @click="tabIndex = index"> {{ item.name }} @@ -41,25 +29,12 @@ - + - + diff --git a/src/components/procurement/index.vue b/src/components/procurement/index.vue index e077c5d..56b1661 100644 --- a/src/components/procurement/index.vue +++ b/src/components/procurement/index.vue @@ -43,7 +43,7 @@ - + diff --git a/src/views/administrative_payments/edit.vue b/src/views/administrative_payments/edit.vue index 18626f5..8c7a379 100644 --- a/src/views/administrative_payments/edit.vue +++ b/src/views/administrative_payments/edit.vue @@ -1,18 +1,15 @@ - + - + - + @@ -77,8 +74,8 @@ - - + + @@ -116,8 +113,8 @@ - {{ item.name }} + {{ item.name }} x diff --git a/src/views/administrative_payments/index.vue b/src/views/administrative_payments/index.vue index 599f873..8a87033 100644 --- a/src/views/administrative_payments/index.vue +++ b/src/views/administrative_payments/index.vue @@ -46,7 +46,7 @@ - + diff --git a/src/views/bid_buy_bidding_document/edit.vue b/src/views/bid_buy_bidding_document/edit.vue index 41105e0..ad2cfcb 100644 --- a/src/views/bid_buy_bidding_document/edit.vue +++ b/src/views/bid_buy_bidding_document/edit.vue @@ -1,7 +1,6 @@ - + - + {{ formData.pay_type }} - {{ + {{ formData.pay_rate }} {{ formData.business_contract_deviation }} diff --git a/src/views/bid_document_examination/edit.vue b/src/views/bid_document_examination/edit.vue index 43832cf..b498e48 100644 --- a/src/views/bid_document_examination/edit.vue +++ b/src/views/bid_document_examination/edit.vue @@ -1,7 +1,6 @@ - + @@ -34,8 +33,7 @@ - + @@ -51,8 +49,7 @@ - + @@ -116,22 +113,22 @@ - + - + - - + + diff --git a/src/views/bid_document_examination_detail/edit.vue b/src/views/bid_document_examination_detail/edit.vue index 5eaa356..18ca89f 100644 --- a/src/views/bid_document_examination_detail/edit.vue +++ b/src/views/bid_document_examination_detail/edit.vue @@ -1,7 +1,6 @@ - + @@ -46,23 +45,23 @@ - + - + - + - + diff --git a/src/views/bid_result/edit.vue b/src/views/bid_result/edit.vue index 6d7dd5a..062cc32 100644 --- a/src/views/bid_result/edit.vue +++ b/src/views/bid_result/edit.vue @@ -29,7 +29,7 @@ - + diff --git a/src/views/contract/edit.vue b/src/views/contract/edit.vue index 31af99b..b0e5108 100644 --- a/src/views/contract/edit.vue +++ b/src/views/contract/edit.vue @@ -79,8 +79,7 @@ - + @@ -121,8 +120,10 @@ value-format="YYYY-MM-DD" placeholder="选择合同有效期"> - + @@ -219,6 +220,27 @@ const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined) const { dictData } = useDictData('contract_type,contract_pricing_method,contract_status,pay_period') +const chekcDate = (rule: any, value: any, callback: any) => { + if (new Date(formData.contract_date) > new Date(formData.expire)) { + callback(new Error('签约日期不能超过合同有效期')) + } else { + callback() + } +} + +const chekcDate1 = (rule: any, value: any, callback: any) => { + if (new Date(value) < new Date(formData.contract_date)) { + callback(new Error('签约日期不能早于签约日期')) + } + else if (new Date(value) > new Date(formData.expire)) { + callback(new Error('计划回款日期不能超过合同有效期')) + } else { + callback() + + } +} + + // 表单数据 const formData = reactive({ id: '', @@ -267,7 +289,8 @@ const tableConfig = reactive( { label: "计划回款日期", value: 'return_date', - date: true + date: true, + check: ['returned_money', chekcDate1], }, { @@ -358,6 +381,7 @@ const popupTitle = computed(() => { + // 表单验证 const formRules = reactive({ diff --git a/src/views/contract_negotiation/detail.vue b/src/views/contract_negotiation/detail.vue index 77d57d9..8fffb46 100644 --- a/src/views/contract_negotiation/detail.vue +++ b/src/views/contract_negotiation/detail.vue @@ -91,7 +91,7 @@ - + + - + + + diff --git a/src/views/contract_negotiation/index.vue b/src/views/contract_negotiation/index.vue index 3569e09..6427744 100644 --- a/src/views/contract_negotiation/index.vue +++ b/src/views/contract_negotiation/index.vue @@ -54,7 +54,7 @@ - + diff --git a/src/views/cost_approved_projects/index.vue b/src/views/cost_approved_projects/index.vue index 1d0ebe3..3dec554 100644 --- a/src/views/cost_approved_projects/index.vue +++ b/src/views/cost_approved_projects/index.vue @@ -80,7 +80,7 @@ - + diff --git a/src/views/customer_demand/edit.vue b/src/views/customer_demand/edit.vue index 3c2fd90..e70498b 100644 --- a/src/views/customer_demand/edit.vue +++ b/src/views/customer_demand/edit.vue @@ -1,7 +1,7 @@ - + diff --git a/src/views/data_report_commission/index.vue b/src/views/data_report_commission/index.vue index cbe75f7..96a2708 100644 --- a/src/views/data_report_commission/index.vue +++ b/src/views/data_report_commission/index.vue @@ -65,7 +65,7 @@ - + diff --git a/src/views/procurement_contract/detail.vue b/src/views/procurement_contract/detail.vue index 2d2ac84..2510790 100644 --- a/src/views/procurement_contract/detail.vue +++ b/src/views/procurement_contract/detail.vue @@ -42,7 +42,7 @@ {{ formData.amount_excluding_tax }} - {{ formData.retention_money_rate }} diff --git a/src/views/procurement_contract/edit.vue b/src/views/procurement_contract/edit.vue index 021cc5b..3b6dd09 100644 --- a/src/views/procurement_contract/edit.vue +++ b/src/views/procurement_contract/edit.vue @@ -75,8 +75,8 @@ :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"> - - + + - + diff --git a/src/views/procurement_contract/index.vue b/src/views/procurement_contract/index.vue index 40c9e1f..4a2ec39 100644 --- a/src/views/procurement_contract/index.vue +++ b/src/views/procurement_contract/index.vue @@ -34,7 +34,7 @@ - + diff --git a/src/views/project_alarm_set/detail.js b/src/views/project_alarm_set/detail.js index 3711871..ad1c7f6 100644 --- a/src/views/project_alarm_set/detail.js +++ b/src/views/project_alarm_set/detail.js @@ -10,19 +10,19 @@ const detailConfig = { value: "project_code" }, { - label: "材料预算花费比例", + label: "材料预算花费比例(%)", value: "material_budget_expenditure_ratio" }, { - label: "人工预算花费比例", + label: "人工预算花费比例(%)", value: "labour_budget_expenditure_ratio" }, { - label: "费用预算花费比例", + label: "费用预算花费比例(%)", value: "cost_budget_expenditure_ratio" }, { - label: "分包预算花费比例", + label: "分包预算花费比例(%)", value: "subcontract_budget_expenditure_ratio" }, diff --git a/src/views/project_alarm_set/edit.vue b/src/views/project_alarm_set/edit.vue index bba0a84..cb7abbd 100644 --- a/src/views/project_alarm_set/edit.vue +++ b/src/views/project_alarm_set/edit.vue @@ -4,7 +4,8 @@ - + @@ -12,22 +13,26 @@ - - + + - - + + - - + + - - + + diff --git a/src/views/project_alarm_set/index.vue b/src/views/project_alarm_set/index.vue index fa26f4a..5197c23 100644 --- a/src/views/project_alarm_set/index.vue +++ b/src/views/project_alarm_set/index.vue @@ -34,12 +34,13 @@ - + - + - - + diff --git a/src/views/project_commission/detail.js b/src/views/project_commission/detail.js index 6fce7f6..d12d238 100644 --- a/src/views/project_commission/detail.js +++ b/src/views/project_commission/detail.js @@ -31,7 +31,7 @@ const detailConfig = { }, { - label: "提成比例", + label: "提成比例(%)", value: "rate" }, { @@ -91,7 +91,7 @@ const detailConfig = { value: 'other_fee', }, { - label: "提成比例", + label: "提成比例(%)", value: 'tc_rate', }, { diff --git a/src/views/project_commission/edit.vue b/src/views/project_commission/edit.vue index d5980a9..7098b28 100644 --- a/src/views/project_commission/edit.vue +++ b/src/views/project_commission/edit.vue @@ -48,8 +48,8 @@ - - + + @@ -160,7 +160,7 @@ - + diff --git a/src/views/project_commission/index.vue b/src/views/project_commission/index.vue index b99ef3c..fedbd5b 100644 --- a/src/views/project_commission/index.vue +++ b/src/views/project_commission/index.vue @@ -53,7 +53,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/src/views/project_commission_detail/edit.vue b/src/views/project_commission_detail/edit.vue index 617730b..008a6fa 100644 --- a/src/views/project_commission_detail/edit.vue +++ b/src/views/project_commission_detail/edit.vue @@ -1,7 +1,6 @@ - + @@ -28,8 +27,8 @@ - - + + diff --git a/src/views/project_commission_detail/index.vue b/src/views/project_commission_detail/index.vue index d602286..9af7d3d 100644 --- a/src/views/project_commission_detail/index.vue +++ b/src/views/project_commission_detail/index.vue @@ -43,7 +43,7 @@ - + diff --git a/src/views/project_list_detail/components/Statistics.vue b/src/views/project_list_detail/components/Statistics.vue index 414aba5..e7bf37f 100644 --- a/src/views/project_list_detail/components/Statistics.vue +++ b/src/views/project_list_detail/components/Statistics.vue @@ -95,7 +95,7 @@ const contractList = reactive([ { name: '已开票', value: 0 }, { name: '已回款', value: 0 }, { name: '未回款', value: 0 }, - { name: '回款比例', value: 0 }, + { name: '回款比例(%)', value: 0 }, ], [ { name: '分包合同金额', value: 0 }, @@ -104,14 +104,14 @@ const contractList = reactive([ { name: '已收票', value: 0 }, { name: '已付款', value: 0 }, { name: '未付款', value: 0 }, - { name: '付款比例', value: 0 }, + { name: '付款比例(%)', value: 0 }, ], [ { name: '材料合同金额', value: 0 }, { name: '已收票', value: 0 }, { name: '已付款', value: 0 }, { name: '未付款', value: 0 }, - { name: '付款比例', value: 0 }, + { name: '付款比例(%)', value: 0 }, ], ]) diff --git a/src/views/project_progress_payment/detail.js b/src/views/project_progress_payment/detail.js index ff1be35..e0e6d3f 100644 --- a/src/views/project_progress_payment/detail.js +++ b/src/views/project_progress_payment/detail.js @@ -58,7 +58,7 @@ const detailConfig = { }, { - label: "合同付款比例", + label: "合同付款比例(%)", value: 'dcntract_payment_rate', }, { @@ -110,7 +110,7 @@ const detailConfig = { value: 'deduction_amount', }, { - label: "完成产值比例(%)", + label: "完成产值比例(%)(%)", value: 'completed_rate', }, { @@ -122,7 +122,7 @@ const detailConfig = { value: 'current_payable_funds', }, { - label: "付款比例", + label: "付款比例(%)", value: 'payment_rate', }, { diff --git a/src/views/project_progress_payment/edit.vue b/src/views/project_progress_payment/edit.vue index 5614a7c..68c5d3f 100644 --- a/src/views/project_progress_payment/edit.vue +++ b/src/views/project_progress_payment/edit.vue @@ -1,7 +1,6 @@ - + @@ -90,7 +89,7 @@ - + @@ -164,7 +163,7 @@ - + @@ -183,7 +182,7 @@ - + diff --git a/src/views/project_progress_payment/index.vue b/src/views/project_progress_payment/index.vue index 500f00b..86280ab 100644 --- a/src/views/project_progress_payment/index.vue +++ b/src/views/project_progress_payment/index.vue @@ -5,8 +5,8 @@ - + @@ -48,22 +48,20 @@ - + - - + + - - + @@ -79,8 +77,8 @@ - + 编辑 - + @@ -35,8 +34,8 @@ - - + @@ -66,14 +65,12 @@ - + - + @@ -87,8 +84,7 @@ - + @@ -98,8 +94,8 @@ - - + @@ -114,13 +110,12 @@ - + - + diff --git a/src/views/project_progress_payment_detail/index.vue b/src/views/project_progress_payment_detail/index.vue index 2e67d0c..613d136 100644 --- a/src/views/project_progress_payment_detail/index.vue +++ b/src/views/project_progress_payment_detail/index.vue @@ -43,12 +43,12 @@ - + - - + + diff --git a/src/views/subcontracting_contract/detail.vue b/src/views/subcontracting_contract/detail.vue index 99d3e39..8dc6e47 100644 --- a/src/views/subcontracting_contract/detail.vue +++ b/src/views/subcontracting_contract/detail.vue @@ -43,7 +43,7 @@ {{ formData.amount_excluding_tax }} - {{ formData.retention_money_rate }} diff --git a/src/views/subcontracting_contract/edit.vue b/src/views/subcontracting_contract/edit.vue index a96fd35..f3751d5 100644 --- a/src/views/subcontracting_contract/edit.vue +++ b/src/views/subcontracting_contract/edit.vue @@ -100,8 +100,8 @@ - - + + diff --git a/src/views/subcontracting_contract_negotiation/subcontract.vue b/src/views/subcontracting_contract_negotiation/subcontract.vue index cd385a1..33e936d 100644 --- a/src/views/subcontracting_contract_negotiation/subcontract.vue +++ b/src/views/subcontracting_contract_negotiation/subcontract.vue @@ -1,67 +1,66 @@ - - - + - - + + + + + :style="{ width: '100%' }"> + :style="{ width: '100%' }"> + :style="{ width: '100%' }"> - + + :style="{ width: '100%' }"> + :style="{ width: '100%' }"> {{item.label}} + :disabled="item.disabled">{{ item.label }} + :style="{ width: '100%' }" placeholder="请选择签订日期" clearable> {{item.label}} + :disabled="item.disabled">{{ item.label }} @@ -69,52 +68,52 @@ {{item.label}} + :disabled="item.disabled">{{ item.label }} + :style="{ width: '100%' }"> + :style="{ width: '100%' }"> - - + + + :style="{ width: '100%' }"> - - + + + :style="{ width: '100%' }"> + :autosize="{ minRows: 4, maxRows: 4 }" :style="{ width: '100%' }"> @@ -131,17 +130,17 @@ 重置 - - + + - - - - - + \ No newline at end of file diff --git a/vite.config.ts b/vite.config.ts index d0839d0..a73e6d3 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -19,7 +19,7 @@ export default defineConfig({ base: "/admin/", server: { host: "0.0.0.0", - port: 8888, + port: 9000, open: true, }, plugins: [