From fc294881353b4a540166341194ed5dfe0acd000e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 18 七月 2024 18:02:04 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b1-expenses.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index 786e791..79d87c5 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -65,10 +65,18 @@
</el-date-picker>
</div>
</div>
- <div class="search_thing">
+ <div class="search_thing" style="width: 340px">
<div class="search_label">濮旀墭鍗曚綅锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.company" @keyup.enter.native="refreshTable()"></el-input></div>
+ <div class="search_input">
+<!-- <el-input size="small" placeholder="璇疯緭鍏�" clearable-->
+<!-- @keyup.enter.native="refreshTable()"></el-input>-->
+ <el-select @focus="getCompanyOptions" @change="refreshTable()" clearable
+ size="small" v-model="componentData.entity.company" style="width: 100%">
+ <el-option v-for="item in companyOptions" :key="item.value"
+ :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
</div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
@@ -78,7 +86,7 @@
</div>
<div class="table">
<ValueTable ref="ValueTable" :url="$api.insOrder.costStatistics" :componentData="componentData" :key="upIndex"
- @handleWeave="handleWeave" />
+ @handleWeave="handleWeave" :column-min-width="'140'"/>
</div>
</div>
<el-dialog title="鍦ㄧ嚎缂栧埗" :visible.sync="claimVisible" width="70%" :modal-append-to-body="false">
@@ -187,7 +195,18 @@
claimVisible: false,
dates: [],
index2: 0,
- total: 0
+ total: 0,
+ companyOptions: [], // 濮旀墭鍗曚綅鏋氫妇鍊�
+ entity: {
+ orderBy: {
+ field: 'id',
+ order: 'asc'
+ }
+ },
+ page: {
+ current: -1,
+ size: -1,
+ },
}
},
mounted() {
@@ -226,6 +245,31 @@
this.index2++
this.componentData.entity.dates = `["${startDate}","${endDate}"]`
},
+ getCompanyOptions () {
+ this.$axios.post(this.$api.user.selectCustomPageList, {
+ page: this.page,
+ entity: this.entity
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }
+ ).then(res => {
+ if (res.code === 200) {
+ const list = res.data.body.records
+ this.companyOptions = []
+ list.map((item) => {
+ const obj = Object.assign({
+ value: item.id,
+ label: item.company,
+ })
+ this.companyOptions.push(obj)
+ })
+ }
+ }).catch(e => {
+ this.$message.error('鏌ヨ澶辫触')
+ })
+ },
refreshTable() {
this.$refs['ValueTable'].selectList()
this.getTotal()
--
Gitblit v1.9.3