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/facilitiesEnvironment/component/three-wastes-treatment.vue | 60 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
index 81ead8f..05d5b6d 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
@@ -1,28 +1,27 @@
<template>
- <div class="capacity-scope">
- <div class="search">
- <div>
- <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
- <el-form-item label="澶囨敞" prop="remark">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.remark">
- </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-form-item>
- </el-form>
+ <div>
+ <div style="display: flex;justify-content: space-between">
+ <div style="display: flex;">
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 48px;font-size: 14px;font-weight: 700;color: #606266;">澶囨敞</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.remark"
+ @keyup.enter.native="searchList"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button type="primary" size="mini" @click="searchList">鏌ヨ</el-button>
+ <el-button size="mini" @click="resetSearchForm">閲嶇疆</el-button>
+ </div>
</div>
- <div>
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <div style="line-height: 30px;">
+ <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>
- <three-wastes-dialog v-if="threeWastesDia" ref="threeWastesDia" @closeThreeWastesDia="closeThreeWastesDia"></three-wastes-dialog>
+ <three-wastes-dialog v-if="threeWastesDia" ref="threeWastesDia"
+ @closeThreeWastesDia="closeThreeWastesDia"></three-wastes-dialog>
</div>
</template>
@@ -121,11 +120,11 @@
// 鏂规硶闆嗗悎
methods: {
// 鏌ヨ鍒楄〃
- searchList () {
+ searchList() {
this.tableLoading = true
- pageInternalWastes({...this.page,...this.searchForm}).then(res => {
+ pageInternalWastes({ ...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
}
@@ -135,16 +134,16 @@
})
},
// 鍒犻櫎
- delPlan (row) {
+ delPlan(row) {
this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
this.tableLoading = true
- removeStandardSubstance({wastesId:row.wastesId}).then(res => {
+ removeStandardSubstance({ wastesId: row.wastesId }).then(res => {
this.tableLoading = false
- if (res.code === 200){
+ if (res.code === 200) {
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}
@@ -160,27 +159,26 @@
});
},
// 鏂板锛岀紪杈戯紝鎵瑰噯寮规
- openFormDia (type, row) {
+ openFormDia(type, row) {
this.threeWastesDia = true
this.$nextTick(() => {
this.$refs.threeWastesDia.openDia(type, row)
})
},
// 瀵煎嚭
- handleDown (row) {
- exportInternalWastes({wastesId:row.wastesId}).then(res =>{
+ handleDown(row) {
+ exportInternalWastes({ wastesId: row.wastesId }).then(res => {
this.outLoading = false
- const blob = new Blob([res],{ type: 'application/msword' });
+ const blob = new Blob([res], { type: 'application/msword' });
this.$download.saveAs(blob, '涓夊簾澶勭悊瀵煎嚭.docx')
- this.$message.success('瀵煎嚭鎴愬姛')
})
},
- closeThreeWastesDia () {
+ closeThreeWastesDia() {
this.threeWastesDia = false
this.searchList()
},
// 閲嶇疆鏌ヨ鏉′欢
- resetSearchForm () {
+ resetSearchForm() {
this.searchForm.remark = '';
this.searchList()
},
--
Gitblit v1.9.3