|
|
@@ -3,7 +3,7 @@
|
|
|
<!-- 标签页导航 -->
|
|
|
<div class="tab-container">
|
|
|
<el-tabs v-model="activeTab" type="card">
|
|
|
- <el-tab-pane label="未确认" name="unconfirmed"></el-tab-pane>
|
|
|
+ <!-- <el-tab-pane label="未确认" name="unconfirmed"></el-tab-pane> -->
|
|
|
<!-- <el-tab-pane label="已确认" name="confirmed"></el-tab-pane>
|
|
|
<el-tab-pane label="挂网区" name="published"></el-tab-pane> -->
|
|
|
</el-tabs>
|
|
|
@@ -37,10 +37,8 @@
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :md="8" :lg="6">
|
|
|
<el-form-item label="分公司" prop="branchCompany">
|
|
|
- <el-select v-model="searchForm.branchCompany" placeholder="请选择分公司" clearable>
|
|
|
- <el-option v-for="item in branchCompanyOptions" :key="item.value"
|
|
|
- :label="item.label" :value="item.value"></el-option>
|
|
|
- </el-select>
|
|
|
+ <el-input v-model="searchForm.branchCompany" placeholder="请输入分公司"
|
|
|
+ clearable></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -61,16 +59,16 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :md="8" :lg="6">
|
|
|
- <el-form-item label="公告类型" prop="noticeType">
|
|
|
- <el-select v-model="searchForm.noticeType" placeholder="请选择公告类型" clearable>
|
|
|
+ <el-form-item label="公告类型" prop="announcementType">
|
|
|
+ <el-select v-model="searchForm.announcementType" placeholder="请选择公告类型" clearable>
|
|
|
<el-option v-for="item in noticeTypeOptions" :key="item.value"
|
|
|
:label="item.label" :value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :md="8" :lg="6">
|
|
|
- <el-form-item label="是否复制" prop="isCopied">
|
|
|
- <el-select v-model="searchForm.isCopied" placeholder="请选择是否复制" clearable>
|
|
|
+ <el-form-item label="客户群" prop="customerGroup">
|
|
|
+ <el-select v-model="searchForm.customerGroup" placeholder="请选择客户群" clearable>
|
|
|
<el-option v-for="item in isCopiedOptions" :key="item.value" :label="item.label"
|
|
|
:value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
@@ -235,36 +233,43 @@ export default {
|
|
|
branchCompany: '',
|
|
|
category: '',
|
|
|
dataSource: '',
|
|
|
- noticeType: '',
|
|
|
- isCopied: '',
|
|
|
+ announcementType: '',
|
|
|
+ customerGroup: '',
|
|
|
publishDate: '',
|
|
|
bidOpeningDate: '',
|
|
|
storageDate: ''
|
|
|
},
|
|
|
// 下拉选择项数据
|
|
|
isRelatedOptions: [
|
|
|
- { label: '是', value: 'true' },
|
|
|
- { label: '否', value: 'false' }
|
|
|
+ { label: '是', value: '1' },
|
|
|
+ { label: '否', value: '0' },
|
|
|
+ { label: '重复', value: '2' }
|
|
|
],
|
|
|
branchCompanyOptions: [
|
|
|
- { label: '天津分公司', value: 'tianjin' },
|
|
|
- { label: '北京分公司', value: 'beijing' },
|
|
|
- { label: '湖南分公司', value: 'hunan' }
|
|
|
+ { label: '天津分公司', value: '天津分公司' },
|
|
|
+ { label: '北京分公司', value: '北京分公司' },
|
|
|
+ { label: '湖南分公司', value: '湖南分公司' }
|
|
|
],
|
|
|
categoryOptions: [
|
|
|
- { label: 'B', value: 'B' }
|
|
|
+ { label: 'B', value: 'B' },
|
|
|
+ { label: 'G', value: 'G' }
|
|
|
],
|
|
|
dataSourceOptions: [
|
|
|
{ label: '剑鱼', value: '剑鱼' },
|
|
|
{ label: '千里马', value: '千里马' }
|
|
|
],
|
|
|
noticeTypeOptions: [
|
|
|
- { label: '公开招标', value: 'public' },
|
|
|
- { label: '单一来源', value: 'single' }
|
|
|
+ { label: '单一', value: '单一' },
|
|
|
+ { label: '拟建', value: '拟建' },
|
|
|
+ { label: '预告', value: '预告' },
|
|
|
+ { label: '预审结果', value: '预审结果' },
|
|
|
+ { label: '采购意向', value: '采购意向' },
|
|
|
+ { label: '论证意见', value: '论证意见' },
|
|
|
+ { label: '需求公示', value: '需求公示' },
|
|
|
],
|
|
|
isCopiedOptions: [
|
|
|
- { label: '是', value: 'true' },
|
|
|
- { label: '否', value: 'false' }
|
|
|
+ { label: '要客', value: '要客' },
|
|
|
+ { label: '非要客', value: '非要客' }
|
|
|
],
|
|
|
exportScopeOptions: [
|
|
|
{ label: '全部数据', value: 'all' },
|
|
|
@@ -320,8 +325,8 @@ export default {
|
|
|
branchCompany: '',
|
|
|
category: '',
|
|
|
dataSource: '',
|
|
|
- noticeType: '',
|
|
|
- isCopied: '',
|
|
|
+ announcementType: '',
|
|
|
+ customerGroup: '',
|
|
|
publishDate: '',
|
|
|
bidOpeningDate: '',
|
|
|
storageDate: ''
|
|
|
@@ -387,12 +392,35 @@ export default {
|
|
|
console.log('分页参数:', this.queryParams);
|
|
|
console.log('搜索条件:', this.searchForm);
|
|
|
this.tableLoading = true;
|
|
|
+
|
|
|
+ // 构建请求参数
|
|
|
+ const requestParams = {
|
|
|
+ ...this.queryParams,
|
|
|
+ // 基本搜索条件
|
|
|
+ announcementTitle: this.searchForm.noticeTitle,
|
|
|
+ projectName: this.searchForm.projectName,
|
|
|
+ isRelevant: this.searchForm.isRelated,
|
|
|
+ branchCompany: this.searchForm.branchCompany,
|
|
|
+ category: this.searchForm.category,
|
|
|
+ dataSource: this.searchForm.dataSource,
|
|
|
+ customerGroup: this.searchForm.customerGroup,
|
|
|
+ announcementType: this.searchForm.announcementType,
|
|
|
+
|
|
|
+ // 日期范围条件
|
|
|
+ publishTimeStart: this.searchForm.publishDate ? this.searchForm.publishDate[0] : '',
|
|
|
+ publishTimeEnd: this.searchForm.publishDate ? this.searchForm.publishDate[1] : '',
|
|
|
+ bidOpeningDateStart: this.searchForm.bidOpeningDate ? this.searchForm.bidOpeningDate[0] : '',
|
|
|
+ bidOpeningDateEnd: this.searchForm.bidOpeningDate ? this.searchForm.bidOpeningDate[1] : '',
|
|
|
+ createTimeStart: this.searchForm.storageDate ? this.searchForm.storageDate[0] : '',
|
|
|
+ createTimeEnd: this.searchForm.storageDate ? this.searchForm.storageDate[1] : ''
|
|
|
+ };
|
|
|
+
|
|
|
/**
|
|
|
* @description: 获取公开市场列表
|
|
|
* @param {*}
|
|
|
* @return {*}
|
|
|
*/
|
|
|
- getFreeMarketList(this.queryParams).then(response => {
|
|
|
+ getFreeMarketList(requestParams).then(response => {
|
|
|
if (response.code === 200) {
|
|
|
this.noticeList = response.rows || [];
|
|
|
this.total = response.total || 0;
|
|
|
@@ -428,6 +456,12 @@ export default {
|
|
|
margin-bottom: 15px;
|
|
|
}
|
|
|
|
|
|
+/* 统一搜索表单中输入控件的宽度 */
|
|
|
+.search-form .el-input,
|
|
|
+.search-form .el-select {
|
|
|
+ width: 100%;
|
|
|
+}
|
|
|
+
|
|
|
.list-container {
|
|
|
background-color: #fff;
|
|
|
padding: 20px;
|
王辉