From c8fae7380b45eb552a4f806c874c5502aabed4ca Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 09 四月 2024 10:31:26 +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 | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index 77eab64..4f667ad 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -56,7 +56,7 @@
<div class="search_label">鏃堕棿鑼冨洿锛�</div>
<div class="search_input">
<el-date-picker
- v-model="componentData.entity.sample"
+ v-model="dates"
type="datetimerange"
range-separator="鑷�"
format="yyyy-MM-dd HH:mm:ss"
@@ -67,22 +67,9 @@
</div>
</div>
<div class="search_thing">
- <div class="search_label">鏍峰搧鍚嶇О锛�</div>
+ <div class="search_label">濮旀墭浜猴細</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.sample" @keyup.enter.native="refreshTable()"></el-input></div>
- </div>
- <div class="search_thing">
- <div class="search_label">鐘舵�侊細</div>
- <div class="search_input">
- <el-select v-model="componentData.entity.status" placeholder="鍏ㄩ儴" size="small">
- <el-option
- v-for="item in statusList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </div>
+ v-model="componentData.entity.name" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
@@ -90,7 +77,7 @@
</div>
</div>
<div class="table">
- <ValueTable ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
+ <ValueTable ref="ValueTable" :url="$api.insOrder.costStatistics" :componentData="componentData"
:key="upIndex" @handleWeave="handleWeave"/>
</div>
</div>
@@ -116,11 +103,9 @@
return {
componentData: {
entity: {
- entrustCode: null,
- sample: null,
- state: 1,
+ name: null,
orderBy: {
- field: 'id',
+ field: 'id,ins_sample_id',
order: 'asc'
}
},
@@ -155,8 +140,8 @@
},
entityCopy: {},
upIndex: 0,
- statusList:[],
- claimVisible:false
+ claimVisible:false,
+ dates: []
}
},
mounted() {
--
Gitblit v1.9.3