From 0a26d58a3906b9e13946c7cb46fae51a0de98920 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 17 三月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue b/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue
index 9d91405..a062abf 100644
--- a/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue
@@ -5,22 +5,22 @@
<el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
<el-form-item label="鏍囧噯鐗╄川鍚嶇О" prop="name">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.name"
- @keyup.enter.native="searchList"></el-input>
+ @keyup.enter.native="searchList"></el-input>
</el-form-item>
- <el-form-item label="瑙勬牸鍨嬪彿" prop="factoryManufacturer">
+ <el-form-item label="瑙勬牸鍨嬪彿" prop="model">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.model"
- @keyup.enter.native="searchList"></el-input>
+ @keyup.enter.native="searchList"></el-input>
</el-form-item>
<el-form-item>
- <el-button size="medium" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
+ <el-button size="small" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
</el-form-item>
</el-form>
</div>
</div>
<div class="table">
<lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'" @pagination="pagination"
- :page="page" :tableLoading="tableLoading"></lims-table>
+ :page="page" :tableLoading="tableLoading"></lims-table>
</div>
</div>
</template>
@@ -32,16 +32,15 @@
} from '@/api/cnas/resourceDemand/standardMaterailRequistion/standardMaterailRequistion'
export default {
+ name: 'StandardMaterailRequistion',
components: {
limsTable
- // TableCard,
- // ZTTable,
},
data() {
return {
searchForm: {
name: '',
- factoryManufacturer: '',
+ model: '',
},
tableColumn: [
{
@@ -106,16 +105,16 @@
mounted() {
this.searchList()
},
- methods :{
+ methods: {
// 鏌ヨ鍒楄〃
- searchList () {
+ searchList() {
this.tableLoading = true
getPageSubstanceRecord({
...this.page,
...this.searchForm
}).then(res => {
this.tableLoading = false
- if (res.code === 200){
+ if (res.code === 200) {
this.tableData = res.data.records
this.page.total = res.data.total
}
@@ -124,7 +123,7 @@
})
},
// 閲嶇疆鏌ヨ鏉′欢
- resetSearchForm () {
+ resetSearchForm() {
this.searchForm.name = '';
this.searchForm.model = '';
this.searchList()
@@ -138,6 +137,10 @@
}
</script>
<style scoped>
+.capacity-scope {
+ padding: 20px !important;
+}
+
.search {
height: 46px;
display: flex;
--
Gitblit v1.9.3