From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/standardMaterial/index.vue | 52 ++++++++++++++++++++++------------------------------
1 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterial/index.vue b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
index e75f44f..4daf629 100644
--- a/src/views/CNAS/resourceDemand/standardMaterial/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
@@ -5,26 +5,26 @@
<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-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.factoryManufacturer"
- @keyup.enter.native="searchList"></el-input>
+ @keyup.enter.native="searchList"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="searchList">鏌� 璇�</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button type="primary" size="mini" @click="searchList">鏌ヨ</el-button>
+ <el-button size="mini" @click="resetSearchForm">閲嶇疆</el-button>
</el-form-item>
</el-form>
</div>
<div>
- <el-button size="medium" @click="exportFun">瀵� 鍑�</el-button>
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" @click="exportFun">瀵� 鍑�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</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>
<form-dia v-if="formDia" ref="formDia" @closeYearDia="closeYearDia"></form-dia>
<borrow-dia v-if="borrowDia" ref="borrowDia" @closeYearDia="closeBorrowDia"></borrow-dia>
@@ -35,9 +35,6 @@
<script>
-// import FormDia from '../do/a6-standard-material-list/formDia.vue';
-// import BorrowDia from '../do/a6-standard-material-list/borrowDia.vue';
-// import ReturnDia from '../do/a6-standard-material-list/returnDia.vue';
import limsTable from '@/components/Table/lims-table.vue'
import {
getPageStandardSubstance,
@@ -48,6 +45,7 @@
import BorrowDia from '../standardMaterial/component/borrowDia.vue';
import ReturnDia from '../standardMaterial/component/returnDia.vue';
export default {
+ name: 'StandardMaterial',
components: {
limsTable,
FormDia,
@@ -121,11 +119,6 @@
prop: 'remark',
minWidth: '100'
},
- // {
- // label: '鍒涘缓浜�',
- // prop: 'createUser',
- // minWidth: '100'
- // },
{
label: '鍒涘缓鏃堕棿',
prop: 'createTime',
@@ -185,39 +178,38 @@
mounted() {
this.searchList()
},
- methods :{
+ methods: {
exportFun() {
this.outLoading = true
- exportOfStandardSubstanceList(this.searchForm).then(res =>{
+ exportOfStandardSubstanceList(this.searchForm).then(res => {
this.outLoading = false
- const blob = new Blob([res], {type: 'application/octet-stream'},false);
+ const blob = new Blob([res], { type: 'application/octet-stream' }, false);
this.$download.saveAs(blob, '鏍囧噯鐗╄川娓呭崟.xlsx')
- this.$message.success('瀵煎嚭鎴愬姛')
})
},
// 鏌ヨ鍒楄〃
- searchList () {
+ searchList() {
this.tableLoading = true
getPageStandardSubstance({
...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
}
})
},
// 鍒犻櫎
- delPlan (row) {
+ delPlan(row) {
this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
this.tableLoading = true
- removeStandardSubstance({id:row.id}).then(res => {
+ removeStandardSubstance({ id: row.id }).then(res => {
this.tableLoading = false
if (res.code === 200) {
this.$message.success('鍒犻櫎鎴愬姛')
@@ -234,40 +226,40 @@
});
},
// 鏂板锛岀紪杈戯紝鎵瑰噯寮规
- openFormDia (type, row) {
+ openFormDia(type, row) {
this.formDia = true
this.$nextTick(() => {
this.$refs.formDia.openDia(type, row)
})
},
- closeYearDia () {
+ closeYearDia() {
this.formDia = false
this.searchList()
},
// 鍊熺敤
- borrow (row) {
+ borrow(row) {
this.borrowDia = true
this.$nextTick(() => {
this.$refs.borrowDia.openDia(row)
})
},
- closeBorrowDia () {
+ closeBorrowDia() {
this.borrowDia = false
this.searchList()
},
// 褰掕繕
- return (row) {
+ return(row) {
this.returnDia = true
this.$nextTick(() => {
this.$refs.returnDia.openDia(row)
})
},
- closeReturnDia () {
+ closeReturnDia() {
this.returnDia = false
this.searchList()
},
// 閲嶇疆鏌ヨ鏉′欢
- resetSearchForm () {
+ resetSearchForm() {
this.searchForm.name = '';
this.searchForm.factoryManufacturer = '';
this.searchList()
--
Gitblit v1.9.3