This commit is contained in:
zmj 2024-04-15 18:02:57 +08:00
parent 39dad0a924
commit 871926d217
6 changed files with 41 additions and 37 deletions

View File

@ -28,14 +28,14 @@
<el-table border :data="pager.lists" @selection-change="handleSelectionChange"> <el-table border :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" /> <el-table-column label="序号" type="index" width="55" />
<el-table-column label="合同名称" prop="contract_name" /> <el-table-column label="项目名称" prop="project_name" />
<el-table-column label="建设单位" prop="build_unit" /> <el-table-column label="投标保证金" prop="bid_margin" />
<el-table-column label="保证金金额" prop="margin_amount" /> <el-table-column label="建设单位" prop="construct_company" />
<el-table-column label="缴纳截止日期" prop="end_date" show-overflow-tooltip /> <el-table-column label="缴纳截止日期" prop="margin_end_date" show-overflow-tooltip />
<el-table-column label="预计退回日期" prop="" show-overflow-tooltip /> <el-table-column label="预计归还日期" prop="expected_return_date" show-overflow-tooltip />
<el-table-column label="申请状态" prop="margin_amount" show-overflow-tooltip /> <el-table-column label="申请状态" prop="apply_status" show-overflow-tooltip />
<el-table-column label="支付状态" prop="" show-overflow-tooltip /> <el-table-column label="支付状态" prop="payment_status" show-overflow-tooltip />
<el-table-column label="回收状态" prop="" show-overflow-tooltip /> <el-table-column label="回收状态" prop="recovery_status" show-overflow-tooltip />
</el-table> </el-table>
</div> </div>
<div class="flex justify-end mt-4"> <div class="flex justify-end mt-4">

View File

@ -34,7 +34,7 @@ var myChart: any
const chartWitdth = ref(500) const chartWitdth = ref(500)
const chartHeight = ref(500) const chartHeight = ref(500)
const chartType = ref(1) const chartType = ref(3)
const chartTypeList = reactive([ const chartTypeList = reactive([
{ {
name: '柱状图', name: '柱状图',
@ -197,9 +197,8 @@ let chartData: object;
const getData = async (fetchFun: Function) => { const getData = async (fetchFun: Function) => {
let res = await fetchFun() let res = await fetchFun()
chartData = res chartData = res
// option1.xAxis.data = chartData.data.map(item => item.name) option3.series[0].data = res.data
// option1.series[0].data = chartData.data.map(item => item.value) option = option3
option = option1
initChart() initChart()
} }
@ -211,6 +210,7 @@ const initChart = () => {
const changeChartType = (e: any) => { const changeChartType = (e: any) => {
console.log(chartData, 'chartData')
switch (e) { switch (e) {
case 1: case 1:
option1.xAxis.data = chartData.data.map(item => item.name) option1.xAxis.data = chartData.data.map(item => item.name)
@ -223,7 +223,7 @@ const changeChartType = (e: any) => {
option = option2 option = option2
break; break;
case 3: case 3:
option3.series[0].data = res.data option3.series[0].data = chartData.data
option = option3 option = option3
break; break;
case 4: case 4:

View File

@ -117,8 +117,8 @@
</el-form> </el-form>
<el-dialog v-model="showDialog" title="选择建设单位" width="70%"> <el-dialog v-model="showDialog" title="选择项目" width="70%">
<dialogTable :config="marketing_bid_info" @customEvent="customEvent"> <dialogTable :config="marketing_bid_info" @customEvent="customEvent" :query="{ bid_status: 1 }">
</dialogTable> </dialogTable>
</el-dialog> </el-dialog>
<!-- <el-dialog v-model="showDialog1" title="选择业务机会" width="70%"> <!-- <el-dialog v-model="showDialog1" title="选择业务机会" width="70%">

View File

@ -170,8 +170,8 @@
</el-form> </el-form>
<el-dialog v-model="showDialog" title="选择建设单位" width="70%"> <el-dialog v-model="showDialog" title="选择项目" width="70%">
<dialogTable :config="marketing_bid_info" @customEvent="customEvent"> <dialogTable :config="marketing_bid_info" @customEvent="customEvent" :query="{ bid_status: 1 }">
</dialogTable> </dialogTable>
</el-dialog> </el-dialog>
<!-- <el-dialog v-model="showDialog1" title="选择业务机会" width="70%"> <!-- <el-dialog v-model="showDialog1" title="选择业务机会" width="70%">

View File

@ -1,7 +1,6 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
@close="handleClose">
<el-form ref="formRef" :model="formData" label-width="140px" :rules="formRules"> <el-form ref="formRef" :model="formData" label-width="140px" :rules="formRules">
<el-card> <el-card>
@ -35,8 +34,8 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="开标日期" prop="bid_open_date"> <el-form-item label="开标日期" prop="bid_open_date">
<el-date-picker class="flex-1 !flex" v-model="formData.bid_open_date" clearable <el-date-picker class="flex-1 !flex" v-model="formData.bid_open_date" clearable type="date"
type="date" value-format="YYYY-MM-DD" placeholder="选择开标日期"> value-format="YYYY-MM-DD" placeholder="选择开标日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -47,8 +46,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="我方报价"> <el-form-item label="我方报价">
<el-input v-model="formData.our_quotation" clearable placeholder="请输入我方报价" <el-input v-model="formData.our_quotation" clearable placeholder="请输入我方报价" type="number" />
type="number" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -103,8 +101,8 @@
</el-card> </el-card>
</el-form> </el-form>
<el-dialog v-model="showDialog" title="选择建设单位" width="70%"> <el-dialog v-model="showDialog" title="选择投标信息" width="70%">
<dialogTable :config="marketing_bid_info" @customEvent="customEvent"> <dialogTable :config="marketing_bid_info" @customEvent="customEvent" :query="{ bid_status: 0 }">
</dialogTable> </dialogTable>
</el-dialog> </el-dialog>
<div v-if="showDialog1"> <div v-if="showDialog1">

View File

@ -18,22 +18,28 @@
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column :render-header="pager.calcWidth" label="项目名称" prop="project_name" <el-table-column :render-header="pager.calcWidth" label="项目名称" prop="project_name"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="业主单位" prop="project_num" <el-table-column :render-header="pager.calcWidth" label="中标通知书编号" prop="bid_result_code"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="中标日期" prop="contract_name" <el-table-column :render-header="pager.calcWidth" label="中标日期" prop="bid_open_date"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="是否中标" prop="contract_type"
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="中标价" prop="amount" show-overflow-tooltip /> <el-table-column label="中标总监/经理" prop="manager" show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="中标通知书编号" prop="part_a" <el-table-column label="建设单位" prop="construct_company" show-overflow-tooltip />
show-overflow-tooltip /> <el-table-column label="总投资" prop="total_investment" show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="投标负责人" prop="part_b" <el-table-column label="项目地点" prop="project_address" show-overflow-tooltip />
show-overflow-tooltip /> <el-table-column label="行业性质" prop="industry_nature" show-overflow-tooltip />
<el-table-column label="工程总投资" prop="sign_money" show-overflow-tooltip /> <el-table-column label="招标方式" prop="bid_type" show-overflow-tooltip />
<el-table-column label="招标负责人" prop="bid_head" show-overflow-tooltip />
<!-- <el-table-column :render-header="pager.calcWidth" label="是否中标" prop="contract_type"
show-overflow-tooltip /> -->
<!-- <el-table-column :render-header="pager.calcWidth" label="中标价" prop="amount" show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="中标通知书编号" prop="part_a" show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="投标负责人" prop="part_b" show-overflow-tooltip />
<el-table-column label="中标总监/经理" prop="sign_time" show-overflow-tooltip /> <el-table-column label="中标总监/经理" prop="sign_time" show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="招标方式" prop="date" show-overflow-tooltip /> <el-table-column :render-header="pager.calcWidth" label="招标方式" prop="date" show-overflow-tooltip />
<el-table-column label="行业性质" prop="total_invoice_amount" show-overflow-tooltip /> <el-table-column label="行业性质" prop="total_invoice_amount" show-overflow-tooltip /> -->
<el-table-column label="项目地点" prop="total_refund_amount" show-overflow-tooltip />
</el-table> </el-table>
</div> </div>
<div class="flex mt-4 justify-end"> <div class="flex mt-4 justify-end">