From c1118d8ba0bb2f16b1959ba2c503e4b80a87f684 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 16 Apr 2024 10:26:18 +0800
Subject: [PATCH] add
---
.../approval_issuance_achievement_documents/index.vue | 6 +++---
src/views/bid_bidding_decision/index.vue | 6 ++----
src/views/bid_buy_bidding_document/index.vue | 2 +-
src/views/bid_margin_list/index.vue | 4 +---
src/views/bid_result/index.vue | 9 +++------
src/views/build_plan/index.vue | 4 ++--
src/views/contract_ledger/index.vue | 6 ++----
src/views/contract_negotiation/index.vue | 7 +++----
src/views/custom_service/index.vue | 2 +-
src/views/data_report_commission/index.vue | 9 +++------
src/views/data_report_ledger/index.vue | 9 +++------
src/views/jianli_project_progress_report/index.vue | 4 ++--
src/views/marketing_contract/index.vue | 6 ++----
src/views/project_attendance_record/index.vue | 9 +++------
src/views/project_commission/index.vue | 4 ++--
src/views/quality_modify/index.vue | 6 ++----
src/views/safety_hazard/index.vue | 6 ++----
src/views/supervision_inspection/index.vue | 3 +--
src/views/supervision_side_station/index.vue | 5 ++---
src/views/task_detail/index.vue | 5 ++---
20 files changed, 42 insertions(+), 70 deletions(-)
diff --git a/src/views/approval_issuance_achievement_documents/index.vue b/src/views/approval_issuance_achievement_documents/index.vue
index a2c9f38..a589990 100644
--- a/src/views/approval_issuance_achievement_documents/index.vue
+++ b/src/views/approval_issuance_achievement_documents/index.vue
@@ -49,9 +49,9 @@
<el-table-column :render-header="pager.calcWidth" label="登记日期" prop="apptime" show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="登记人" prop="person" show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="备注" prop="tips" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="多行文本框1" prop="fd_1" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="多行文本框2" prop="fd_2" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="多行文本框3" prop="fd_3" show-overflow-tooltip />
+ <el-table-column label="多行文本框1" prop="fd_1" show-overflow-tooltip />
+ <el-table-column label="多行文本框2" prop="fd_2" show-overflow-tooltip />
+ <el-table-column label="多行文本框3" prop="fd_3" show-overflow-tooltip />
<el-table-column label="操作" width="170" fixed="right">
<template #default="{ row }">
diff --git a/src/views/bid_bidding_decision/index.vue b/src/views/bid_bidding_decision/index.vue
index bc32fcd..7d2648c 100644
--- a/src/views/bid_bidding_decision/index.vue
+++ b/src/views/bid_bidding_decision/index.vue
@@ -64,10 +64,8 @@
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="保证金退还时间" width="155"
prop="margin_amount_return_date" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="有无内部资源" width="155"
- prop="is_internal_resources" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="项目把握度" width="85" prop="project_assurance"
- show-overflow-tooltip />
+ <el-table-column label="有无内部资源" width="155" prop="is_internal_resources" show-overflow-tooltip />
+ <el-table-column label="项目把握度" width="85" prop="project_assurance" show-overflow-tooltip />
<el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }">
<el-button v-perms="['bid.bid_bidding_decision/edit']" type="primary" link
diff --git a/src/views/bid_buy_bidding_document/index.vue b/src/views/bid_buy_bidding_document/index.vue
index 567d055..8a40596 100644
--- a/src/views/bid_buy_bidding_document/index.vue
+++ b/src/views/bid_buy_bidding_document/index.vue
@@ -55,7 +55,7 @@
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="购买标书时间" prop="buy_date" width="120"
show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="招标方式" prop="bid_type" show-overflow-tooltip />
+ <el-table-column label="招标方式" prop="bid_type" show-overflow-tooltip />
<el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }">
diff --git a/src/views/bid_margin_list/index.vue b/src/views/bid_margin_list/index.vue
index 7519b15..bfa4e11 100644
--- a/src/views/bid_margin_list/index.vue
+++ b/src/views/bid_margin_list/index.vue
@@ -3,7 +3,7 @@
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="所属项目" prop="project_id">
- <selectRemote :formData="queryParams" model="project_id" :api="apiProjectSearch" />
+ <!-- <selectRemote :formData="queryParams" model="project_id" :api="apiProjectSearch" /> -->
</el-form-item>
<!-- <el-form-item label="标书编号" prop="bid_document_no">
<el-input class="w-[250px]" v-model="queryParams.bid_document_no" clearable placeholder="请输入标书编号" />
@@ -42,7 +42,6 @@
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
-
</div>
</template>
@@ -53,7 +52,6 @@ import feedback from '@/utils/feedback'
-
// 查询条件
const queryParams = reactive({
bid_document_no: '',
diff --git a/src/views/bid_result/index.vue b/src/views/bid_result/index.vue
index a476b9c..a0d0c8b 100644
--- a/src/views/bid_result/index.vue
+++ b/src/views/bid_result/index.vue
@@ -38,16 +38,13 @@
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="开标日期" prop="bid_opening_date"
show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="是否中标" prop="is_successful"
- show-overflow-tooltip>
+ <el-table-column label="是否中标" prop="is_successful" show-overflow-tooltip>
<template #default="{ row }">
<dict-value :options="dictData.is_successful" :value="row.is_successful" />
</template>
</el-table-column>
- <el-table-column :render-header="pager.calcWidth" label="中标单位" prop="bidder_company"
- show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="中标金额" prop="bidder_amount"
- show-overflow-tooltip />
+ <el-table-column label="中标单位" prop="bidder_company" show-overflow-tooltip />
+ <el-table-column label="中标金额" prop="bidder_amount" show-overflow-tooltip />
<el-table-column label="操作" width="160" align="center" fixed="right">
<template #default="{ row }">
diff --git a/src/views/build_plan/index.vue b/src/views/build_plan/index.vue
index 3f21e33..5f69eb3 100644
--- a/src/views/build_plan/index.vue
+++ b/src/views/build_plan/index.vue
@@ -65,8 +65,8 @@
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="进度(%)" prop="completion_degree"
show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="单价" prop="price" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="金额" prop="amount" show-overflow-tooltip />
+ <el-table-column label="单价" prop="price" show-overflow-tooltip />
+ <el-table-column label="金额" prop="amount" show-overflow-tooltip />
<el-table-column label="操作" width="170" fixed="right">
diff --git a/src/views/contract_ledger/index.vue b/src/views/contract_ledger/index.vue
index a647ddf..bfa3fbc 100644
--- a/src/views/contract_ledger/index.vue
+++ b/src/views/contract_ledger/index.vue
@@ -51,10 +51,8 @@
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="开票未回款金额" prop="invoice_not_refund_amount"
show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="回款未开票金额" prop="refund_not_invoice_amount"
- show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="合同结算日期" prop="settlement_date"
- show-overflow-tooltip width="120" />
+ <el-table-column label="回款未开票金额" prop="refund_not_invoice_amount" show-overflow-tooltip />
+ <el-table-column label="合同结算日期" prop="settlement_date" show-overflow-tooltip width="120" />
</el-table>
</div>
<div class="flex mt-4 justify-end">
diff --git a/src/views/contract_negotiation/index.vue b/src/views/contract_negotiation/index.vue
index 02664a9..dbfaed5 100644
--- a/src/views/contract_negotiation/index.vue
+++ b/src/views/contract_negotiation/index.vue
@@ -54,10 +54,9 @@
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="签约日期" prop="contract_date"
show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="业务负责人" prop="business_director" />
- <el-table-column :render-header="pager.calcWidth" label="利润" prop="profit" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="利润率" prop="profit_rate"
- show-overflow-tooltip />
+ <el-table-column label="业务负责人" prop="business_director" />
+ <el-table-column label="利润" prop="profit" show-overflow-tooltip />
+ <el-table-column label="利润率" prop="profit_rate" show-overflow-tooltip />
<el-table-column label="操作" width="170" fixed="right">
<template #default="{ row }">
<el-button v-perms="['contract.contract_negotiation/edit']" type="primary" link
diff --git a/src/views/custom_service/index.vue b/src/views/custom_service/index.vue
index 4724a24..5c5146f 100644
--- a/src/views/custom_service/index.vue
+++ b/src/views/custom_service/index.vue
@@ -80,7 +80,7 @@
<el-table-column :render-header="pager.calcWidth" label="问题是否解决" prop="is_solve_text" width="110"
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="完成日期" prop="done_date" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="评分" prop="score" show-overflow-tooltip />
+ <el-table-column label="评分" prop="score" show-overflow-tooltip />
<el-table-column label="操作" width="200" fixed="right">
<template #default="{ row }">
<el-button v-perms="['custom_service.custom_service/solve']" type="primary" link
diff --git a/src/views/data_report_commission/index.vue b/src/views/data_report_commission/index.vue
index 563737c..9b3e5ed 100644
--- a/src/views/data_report_commission/index.vue
+++ b/src/views/data_report_commission/index.vue
@@ -19,12 +19,9 @@
<div class="mt-4">
<el-table :data="pager.lists" border>
<el-table-column type="selection" width="55" />
- <el-table-column label="项目编号" :render-header="pager.calcWidth" prop="project_num"
- show-overflow-tooltip />
- <el-table-column label="项目名称" :render-header="pager.calcWidth" prop="project_name"
- show-overflow-tooltip />
- <el-table-column label="合同名称" :render-header="pager.calcWidth" prop="contract_name"
- show-overflow-tooltip />
+ <el-table-column label="项目编号" prop="project_num" show-overflow-tooltip />
+ <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
+ <el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
<el-table-column label="专业" width="200">
<template #default="{ row }">
<el-table :data="row.children" :show-header="false">
diff --git a/src/views/data_report_ledger/index.vue b/src/views/data_report_ledger/index.vue
index f2f2514..c8bc057 100644
--- a/src/views/data_report_ledger/index.vue
+++ b/src/views/data_report_ledger/index.vue
@@ -41,12 +41,9 @@
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="已开票金额" prop="total_invoice_amount"
show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="已到账金额" prop="total_refund_amount"
- show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="已结算金额" prop="total_settlement_amount"
- show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="应收账款" prop="total_collection_amount"
- show-overflow-tooltip />
+ <el-table-column label="已到账金额" prop="total_refund_amount" show-overflow-tooltip />
+ <el-table-column label="已结算金额" prop="total_settlement_amount" show-overflow-tooltip />
+ <el-table-column label="应收账款" prop="total_collection_amount" show-overflow-tooltip />
</el-table>
</div>
<div class="flex justify-end mt-4">
diff --git a/src/views/jianli_project_progress_report/index.vue b/src/views/jianli_project_progress_report/index.vue
index 8aa60b3..f9fff6a 100644
--- a/src/views/jianli_project_progress_report/index.vue
+++ b/src/views/jianli_project_progress_report/index.vue
@@ -56,9 +56,9 @@
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="本阶段完成进度(%)" prop="bjd_progress"
show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="登记人" prop="djr" show-overflow-tooltip />
+ <el-table-column label="登记人" prop="djr" show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="登记时间" prop="apptime" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="形象进度描述" prop="jdms" show-overflow-tooltip />
+ <el-table-column label="形象进度描述" prop="jdms" show-overflow-tooltip />
<el-table-column label="操作" width="170" fixed="right" align="center">
<template #default="{ row }">
<el-button v-perms="['project_process_management.jianli_project_progress_report/edit']"
diff --git a/src/views/marketing_contract/index.vue b/src/views/marketing_contract/index.vue
index 3f55d43..61af0f4 100644
--- a/src/views/marketing_contract/index.vue
+++ b/src/views/marketing_contract/index.vue
@@ -103,10 +103,8 @@
<el-table-column :render-header="pager.calcWidth" label="计划结束" prop="end_date" show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="签订时间" prop="create_time"
show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="审核状态" prop="approve_status_text"
- show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="移交状态" prop="review_status_text"
- show-overflow-tooltip />
+ <el-table-column label="审核状态" prop="approve_status_text" show-overflow-tooltip />
+ <el-table-column label="移交状态" prop="review_status_text" show-overflow-tooltip />
<el-table-column label="操作" width="170" fixed="right">
<template #default="{ row }">
<el-button v-perms="['marketing.marketing_contract/edit']" type="primary" link
diff --git a/src/views/project_attendance_record/index.vue b/src/views/project_attendance_record/index.vue
index 402565a..9c7c0f9 100644
--- a/src/views/project_attendance_record/index.vue
+++ b/src/views/project_attendance_record/index.vue
@@ -39,12 +39,9 @@
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="日工资合计" prop="daily_salary_total"
show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="日生活费合计" prop="daily_living_total"
- show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="日补贴合计" prop="daily_subsidy_total"
- show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="日其它合计" prop="daily_other_total"
- show-overflow-tooltip width="100" />
+ <el-table-column label="日生活费合计" prop="daily_living_total" show-overflow-tooltip />
+ <el-table-column label="日补贴合计" prop="daily_subsidy_total" show-overflow-tooltip />
+ <el-table-column label="日其它合计" prop="daily_other_total" show-overflow-tooltip width="100" />
<el-table-column label="日收入合计" prop="daily_income_total" show-overflow-tooltip width="100" />
<el-table-column label="操作" width="160" fixed="right">
diff --git a/src/views/project_commission/index.vue b/src/views/project_commission/index.vue
index 21c9346..7bb435a 100644
--- a/src/views/project_commission/index.vue
+++ b/src/views/project_commission/index.vue
@@ -79,8 +79,8 @@
<el-table-column :render-header="pager.calcWidth" label="已支付总额" prop="total_pay_amount"
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="本次支付总额" prop="bczfze" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="登记人" prop="djr" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="登记日期" prop="apptime" show-overflow-tooltip />
+ <el-table-column label="登记人" prop="djr" show-overflow-tooltip />
+ <el-table-column label="登记日期" prop="apptime" show-overflow-tooltip />
<!-- <el-table-column :render-header="pager.calcWidth" label="备注" prop="remark" show-overflow-tooltip /> -->
<el-table-column label="操作" width="170" fixed="right">
<template #default="{ row }">
diff --git a/src/views/quality_modify/index.vue b/src/views/quality_modify/index.vue
index 60b4d86..52e479b 100644
--- a/src/views/quality_modify/index.vue
+++ b/src/views/quality_modify/index.vue
@@ -57,10 +57,8 @@
<el-table-column :render-header="pager.calcWidth" label="整改单位" prop="modify_unit"
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="检查项" prop="check_item" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="质量隐患" prop="quality_hazards"
- show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="检查结果" prop="check_result"
- show-overflow-tooltip />
+ <el-table-column label="质量隐患" prop="quality_hazards" show-overflow-tooltip />
+ <el-table-column label="检查结果" prop="check_result" show-overflow-tooltip />
<el-table-column label="操作" width="170" fixed="right">
diff --git a/src/views/safety_hazard/index.vue b/src/views/safety_hazard/index.vue
index a4ba963..0b79e83 100644
--- a/src/views/safety_hazard/index.vue
+++ b/src/views/safety_hazard/index.vue
@@ -72,10 +72,8 @@
<el-table-column :render-header="pager.calcWidth" label="主责部门" prop="department"
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="主要人员" prop="users" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="技术措施" prop="technical_measure"
- show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="管理措施" prop="manage_measure"
- show-overflow-tooltip />
+ <el-table-column label="技术措施" prop="technical_measure" show-overflow-tooltip />
+ <el-table-column label="管理措施" prop="manage_measure" show-overflow-tooltip />
<el-table-column label="应急措施" width="200px" prop="emergency_measure" show-overflow-tooltip />
<el-table-column label="操作" width="170" fixed="right">
diff --git a/src/views/supervision_inspection/index.vue b/src/views/supervision_inspection/index.vue
index 66eb8ca..0089b4f 100644
--- a/src/views/supervision_inspection/index.vue
+++ b/src/views/supervision_inspection/index.vue
@@ -58,8 +58,7 @@
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="设置重点关注事项" prop="is_important_text"
show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="关注人" prop="follow_user"
- show-overflow-tooltip />
+ <el-table-column label="关注人" prop="follow_user" show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="检查表单选择" prop="check_item_detail_name"
show-overflow-tooltip />
<el-table-column label="操作" width="170" fixed="right">
diff --git a/src/views/supervision_side_station/index.vue b/src/views/supervision_side_station/index.vue
index 8912116..ecdaf5d 100644
--- a/src/views/supervision_side_station/index.vue
+++ b/src/views/supervision_side_station/index.vue
@@ -42,7 +42,7 @@
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="单位工程" prop="check_item_name"
show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="部位" prop="position" show-overflow-tooltip />
+ <el-table-column label="部位" prop="position" show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="施工单位" prop="company_name"
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="旁站开始时间" prop="start_time"
@@ -57,8 +57,7 @@
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="旁站人员" prop="side_station_user"
show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="检查项选择" prop="check_item_detail_name"
- show-overflow-tooltip />
+ <el-table-column label="检查项选择" prop="check_item_detail_name" show-overflow-tooltip />
<el-table-column label="操作" width="170" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_work.supervision_side_station/edit']" type="primary" link
diff --git a/src/views/task_detail/index.vue b/src/views/task_detail/index.vue
index ac83c4c..bd691ae 100644
--- a/src/views/task_detail/index.vue
+++ b/src/views/task_detail/index.vue
@@ -54,9 +54,8 @@
<el-table-column :render-header="pager.calcWidth" label="联系电话" prop="contact_phone"
show-overflow-tooltip />
<el-table-column :render-header="pager.calcWidth" label="天数" prop="days" show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="开始日期" prop="start_date"
- show-overflow-tooltip />
- <el-table-column :render-header="pager.calcWidth" label="结束日期" prop="end_date" show-overflow-tooltip />
+ <el-table-column label="开始日期" prop="start_date" show-overflow-tooltip />
+ <el-table-column label="结束日期" prop="end_date" show-overflow-tooltip />
<!-- <el-table-column label="备注" prop="remark" show-overflow-tooltip /> -->
<el-table-column label="操作" width="120" fixed="right">