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/standardMaterialAccept/index.vue | 106 +++++++++++++++++++++++-----------------------------
1 files changed, 47 insertions(+), 59 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
index 241a3c0..5028823 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
@@ -1,42 +1,39 @@
<template>
<div class="capacity-scope">
- <div class="search">
- <div>
- <el-form :model="form" ref="form" size="small" :inline="true">
- <el-form-item label="鐗╄川鍚嶇О">
- <el-input v-model="form.search"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button @click="reset">閲� 缃�</el-button>
- <el-button type="primary" @click="getTableData">鏌� 璇�</el-button>
- </el-form-item>
- </el-form>
+ <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: 88px;font-size: 14px;font-weight: 700;color: #606266;">鐗╄川鍚嶇О</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="form.name"
+ @keyup.enter.native="getTableData"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button type="primary" @click="getTableData" size="mini">鏌ヨ</el-button>
+ <el-button @click="reset" size="mini">閲嶇疆</el-button>
+ </div>
</div>
- <div>
+ <div style="line-height: 30px;">
<el-button icon="el-icon-plus" size="small" type="primary" @click="openDialog">娣诲姞楠屾敹</el-button>
<el-button size="small" type="primary" @click="exportExcel">瀵煎嚭</el-button>
</div>
</div>
<div class="table">
<lims-table :tableData="tableData" :column="columns" :height="'calc(100vh - 250px)'" @pagination="pagination"
- :page="page" :tableLoading="tableLoading"></lims-table>
+ :page="page" :tableLoading="tableLoading">
+ <template slot="action" slot-scope="{ row }">
+ <el-button type="text" @click="edit(row)">缂栬緫</el-button>
+ </template>
+ </lims-table>
</div>
- <AddRecord ref="addRecordRef" @submit="submit"></AddRecord>
+ <AddRecord ref="addRecordRef" v-if="addRecordRef" @submit="submit"></AddRecord>
</div>
</template>
<script>
-// import axios from "axios";
-// import { getPageAcceptance, addAcceptance, updateAcceptance, getAcceptanceDetails, exportAcceptance } from "@/assets/api/api";
-// import ZTTable from '@/components/caorui/ZTTable/index.vue';
-// import AddRecord from './components/AddRecord.vue';
-
import limsTable from '@/components/Table/lims-table.vue'
import AddRecord from './component/AddRecord.vue';
import {
- getPageAcceptance,
- updateAcceptanc,
- addAcceptance
+ getPageAcceptance, getAcceptanceDetails, exportFeStandardSubstanceAcceptance, updateAcceptance, addAcceptance
} from '@/api/cnas/resourceDemand/standardMaterialAccept/standardMaterialAccept'
export default {
components: {
@@ -46,8 +43,9 @@
data() {
return {
form: {
- search: undefined
+ name: undefined
},
+ addRecordRef: false,
columns: [
{
label: "鍑哄満缂栧彿",
@@ -114,56 +112,42 @@
this.getTableData()
},
methods: {
- async getTableData() {
- const res = await getPageAcceptance(this.form);
- if (res.code === 200) {
+ getTableData() {
+ this.tableLoading = true
+ getPageAcceptance({...this.form, ...this.page}).then(res => {
+ this.tableLoading = false
this.tableData = res.data.records;
this.page.total = res.data.total;
- }
-
+ }).catch(error => {
+ this.tableLoading = false
+ })
},
openDialog() {
- this.$refs.addRecordRef.openDialog()
- },
- async submit(form) {
-
- const { code } = await form.acceptance.id ? updateAcceptanc(this.form) : addAcceptance((this.form));
- if (code == 200) {
- this.$message.success(`${form.acceptance.id ? '缂栬緫' : '娣诲姞'}鎴愬姛`)
- this.getTableData()
- }
- },
- async edit(row) {
- const res = await this.getDetail(row.id)
- this.$refs.addRecordRef.openDialog({
- acceptance: res.acceptance,
- list: res.list
+ this.addRecordRef = true;
+ this.$nextTick(() => {
+ this.$refs.addRecordRef.openDialog()
})
},
- async getDetail(id) {
- const { code, data } = await axios({
- method: 'get',
- url: getAcceptanceDetails,
- params: { id }
+ submit() {
+ this.addRecordRef = false;
+ this.getTableData()
+ },
+ edit(row) {
+ this.addRecordRef = true;
+ this.$nextTick(() => {
+ this.$refs.addRecordRef.openDialog(row.id)
})
- if (code == 200) {
- return data;
- }
},
reset() {
- this.form.search = undefined
+ this.form.name = undefined
this.getTableData()
},
async exportExcel() {
- const res = await axios({
- method: "get",
- url: `${exportAcceptance}`,
- responseType: "blob"
+ exportFeStandardSubstanceAcceptance().then(res => {
+ const blob = new Blob([res], { type: 'application/octet-stream' });
+ this.$download.saveAs(blob, '鏍囧噯鐗╄川楠屾敹.xlsx');
})
- const blob = new Blob([res], { type: 'application/octet-stream' });
- this.$download.saveAs(blob, '鏍囧噯鐗╄川楠屾敹.xlsx');
},
-
// 鍒嗛〉鍒囨崲
pagination(page) {
this.page.size = page.limit
@@ -174,6 +158,10 @@
</script>
<style scoped>
+.capacity-scope {
+ padding: 20px !important;
+}
+
.search {
height: 46px;
display: flex;
--
Gitblit v1.9.3