From cf2391a86bdea88196d49cd33949570f74c0985d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 22 九月 2025 18:03:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
frontWuhu/src/views/business/demandRecord.vue | 61 +++++++++++++++---------------
1 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/frontWuhu/src/views/business/demandRecord.vue b/frontWuhu/src/views/business/demandRecord.vue
index b987280..e6b762f 100644
--- a/frontWuhu/src/views/business/demandRecord.vue
+++ b/frontWuhu/src/views/business/demandRecord.vue
@@ -2,14 +2,22 @@
<TableLayout :permissions="['business:demandrecord:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="搴旂敤鍚嶇О" prop="applicationId">
- <el-input v-model="searchForm.applicationId" placeholder="璇疯緭鍏ュ簲鐢ㄥ悕绉�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="搴旂敤鍚嶇О" prop="applicationName">
+ <el-input v-model="searchForm.applicationName" placeholder="璇疯緭鍏ュ簲鐢ㄥ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="闇�姹傛彁鍑鸿��" prop="linkName">
- <el-input v-model="searchForm.linkName" placeholder="璇疯緭鍏ヨ仈绯讳汉濮撳悕" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.linkName" placeholder="璇疯緭鍏ラ渶姹傛彁鍑鸿�呭鍚�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鎻愪氦鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鎻愪氦鏃堕棿" @change="search"/>
+ <el-date-picker
+ v-model="time"
+ type="daterange"
+ range-separator="鑷�"
+ @change="getTime"
+ value-format="yyyy-MM-dd"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -27,23 +35,12 @@
:data="tableData.list"
stripe
>
- <el-table-column prop="applicationId" label="搴旂敤鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="companyId" label="闇�姹備紒涓�" min-width="100px"></el-table-column>
+ <el-table-column prop="applicationName" label="搴旂敤鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="闇�姹備紒涓�" min-width="100px"></el-table-column>
<el-table-column prop="linkName" label="鑱旂郴浜哄鍚�" min-width="100px"></el-table-column>
<el-table-column prop="linkPhone" label="鑱旂郴浜虹數璇�" min-width="100px"></el-table-column>
<el-table-column prop="details" label="鎻忚堪" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:demandrecord:update', 'business:demandrecord:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaDemandRecordWindow.open('缂栬緫闇�姹傝褰�', row)" icon="el-icon-edit" v-permissions="['business:demandrecord:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:demandrecord:delete']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -70,20 +67,12 @@
return {
// 鎼滅储
searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- status: '',
- remark: '',
- applicationId: '',
- companyId: '',
+ applicationName: '',
linkName: '',
- linkPhone: '',
- details: ''
- }
+ startDate: '',
+ endDate: ''
+ },
+ time: []
}
},
created () {
@@ -94,6 +83,18 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ getTime(e) {
+ if (e && e.length > 0) {
+ this.searchForm.startDate = e[0]
+ this.searchForm.endDate = e[1]
+ } else {
+ this.searchForm.startDate = ''
+ this.searchForm.endDate = ''
+ }
+ this.search()
+ }
}
}
</script>
--
Gitblit v1.9.3