From 357950ab1edc9f5f172b6f478d2b447ecae95fd8 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Wed, 10 Apr 2024 10:24:46 +0800
Subject: [PATCH] update

---
 src/views/cost_approved_projects/index.vue    | 43 +++++--------------
 .../marketing_handover_contract/index.vue     |  2 +-
 2 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/src/views/cost_approved_projects/index.vue b/src/views/cost_approved_projects/index.vue
index bb5ebd4..37df9ed 100644
--- a/src/views/cost_approved_projects/index.vue
+++ b/src/views/cost_approved_projects/index.vue
@@ -23,6 +23,15 @@
                             <el-input v-model="queryParams.part_b" clearable placeholder="请输入乙方签约单位" />
                         </el-form-item>
                     </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="合同类型 ">
+                            <el-select v-model="queryParams.contract_type" class="flex-1 ">
+                                <el-option label="主合同" :value="0"></el-option>
+                                <el-option label="框架协议" :value="1"></el-option>
+                                <el-option label="补充协议" :value="2"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="6">
                         <el-form-item label="业务性质" prop="business_nature">
                             <el-select class="flex-1" v-model="queryParams.business_nature" clearable
@@ -32,32 +41,6 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="行业性质" prop="industry_nature">
-                            <el-select class="flex-1" v-model="queryParams.industry_nature" clearable
-                                placeholder="请选择行业性质">
-                                <el-option v-for="(item, index) in dictData.cost_consultation_industry_nature"
-                                    :key="index" :label="item.name" :value="parseInt(item.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="资金来源" prop="fund_sources">
-                            <el-select class="flex-1" v-model="queryParams.fund_sources" clearable
-                                placeholder="请选择资金来源">
-                                <el-option v-for="(item, index) in dictData.cost_consultation_fund_sources" :key="index"
-                                    :label="item.name" :value="parseInt(item.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="建设区域" prop="const_area">
-                            <el-select class="flex-1" v-model="queryParams.const_area" clearable placeholder="请选择建设区域">
-                                <el-option v-for="(item, index) in dictData.cost_consultation_const_area" :key="index"
-                                    :label="item.name" :value="parseInt(item.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
                     <el-col :span="6">
                         <el-form-item>
                             <el-button type="primary" @click="resetPage">查询</el-button>
@@ -81,14 +64,7 @@
                     <el-table-column label="工程投资" prop="project_money" show-overflow-tooltip />
                     <el-table-column label="签订金额" prop="signed_amount" show-overflow-tooltip />
                     <el-table-column label="签订部门" prop="signed_dept_name" show-overflow-tooltip />
-                    <el-table-column label="监管部门" prop="supervise_dept_name" show-overflow-tooltip />
-                    <el-table-column label="项目经理" prop="project_manager_name" show-overflow-tooltip />
                     <el-table-column label="业务性质" prop="business_nature_text" show-overflow-tooltip />
-                    <el-table-column label="行业性质" prop="industry_nature_text" show-overflow-tooltip />
-                    <el-table-column label="资金来源" prop="fund_sources_text" show-overflow-tooltip />
-                    <el-table-column label="建设区域" prop="const_area_text" 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="操作" fixed="right" width="200" align="center">
                         <template #default="{ row }">
                             <el-button v-perms="['cost_project.cost_approved_project/detail']" link
@@ -137,6 +113,7 @@ const showDetail = ref(false)
 const queryParams = reactive({
     contract_name: '',
     contract_code: '',
+    contract_type: '',
     part_a: '',
     part_b: '',
     business_nature: '',
diff --git a/src/views/marketing_handover_contract/index.vue b/src/views/marketing_handover_contract/index.vue
index 143ade3..c932876 100644
--- a/src/views/marketing_handover_contract/index.vue
+++ b/src/views/marketing_handover_contract/index.vue
@@ -15,7 +15,7 @@
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="合同类型 ">
-                            <el-select v-model="queryParams.queryParams" class="flex-1 ">
+                            <el-select v-model="queryParams.contract_type" class="flex-1 ">
                                 <el-option label="主合同" :value="0"></el-option>
                                 <el-option label="框架协议" :value="1"></el-option>
                                 <el-option label="补充协议" :value="2"></el-option>