From b4c2cbc7825fe4732fb6333447fdada9567bcb97 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 17:48:36 +0800
Subject: [PATCH] 资源需求（标准物质相关）模块调整；新增统一附件组件并接入供应商管理与客户满意度；客户满意度表单改客户卡片下拉并关联已完成委托单；预览、图表、导航栏等组件调整
---
src/views/CNAS/resourceDemand/standardMaterial/index.vue | 39 +++++++++++++--------------------------
1 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterial/index.vue b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
index 1c76435..faee58c 100644
--- a/src/views/CNAS/resourceDemand/standardMaterial/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
@@ -20,7 +20,6 @@
<div>
<el-button size="small" @click="exportFun">瀵� 鍑�</el-button>
<el-button size="small" type="primary" @click="importVisible = true">瀵� 鍏�</el-button>
- <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</div>
</div>
<div class="table">
@@ -28,8 +27,7 @@
: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>
- <return-dia v-if="returnDia" ref="returnDia" @closeYearDia="closeReturnDia"></return-dia>
+ <borrow-dia v-if="borrowDia" ref="borrowDia" @closeBorrowDia="closeBorrowDia"></borrow-dia>
<el-dialog title="鏍囧噯鐗╄川瀵煎叆" v-model="importVisible" width="500px" @closed="resetImport">
<div style="margin-bottom: 12px;">
璇蜂娇鐢ㄦ爣鍑嗙墿璐ㄥ鍏ユā鏉垮～鍐欐暟鎹紝鍗曚釜鏂囦欢涓嶈秴杩�10MB銆�
@@ -61,14 +59,12 @@
} from '@/api/cnas/resourceDemand/standardMaterial/standardMaterial'
import FormDia from '../standardMaterial/component/formDia.vue';
import BorrowDia from '../standardMaterial/component/borrowDia.vue';
-import ReturnDia from '../standardMaterial/component/returnDia.vue';
export default {
name: 'StandardMaterial',
components: {
limsTable,
FormDia,
- BorrowDia,
- ReturnDia
+ BorrowDia
},
data() {
return {
@@ -93,6 +89,11 @@
minWidth: '100'
},
{
+ label: '渚涘簲鍟�',
+ prop: 'supplier',
+ minWidth: '120'
+ },
+ {
label: '鍑哄巶缂栧彿',
prop: 'factoryNum',
minWidth: '100'
@@ -111,6 +112,11 @@
label: '鏁伴噺',
prop: 'quantity',
minWidth: '100'
+ },
+ {
+ label: '鍗曚綅',
+ prop: 'unit',
+ minWidth: '80'
},
{
label: '璐疆鏃ユ湡',
@@ -156,18 +162,11 @@
},
},
{
- name: '鍊熺敤',
+ name: '棰嗙敤',
type: 'text',
clickFun: (row) => {
this.borrow(row);
},
- },
- {
- name: '褰掕繕',
- type: 'text',
- clickFun: (row) => {
- this.return(row);
- }
},
{
name: '鍒犻櫎',
@@ -190,7 +189,6 @@
total: 0,
formDia: false,
borrowDia: false,
- returnDia: false,
importVisible: false,
importing: false,
importFiles: [],
@@ -316,17 +314,6 @@
},
closeBorrowDia() {
this.borrowDia = false
- this.searchList()
- },
- // 褰掕繕
- return(row) {
- this.returnDia = true
- this.$nextTick(() => {
- this.$refs.returnDia.openDia(row)
- })
- },
- closeReturnDia() {
- this.returnDia = false
this.searchList()
},
// 閲嶇疆鏌ヨ鏉′欢
--
Gitblit v1.9.3