From a1faa94fbf85553f22da934a1abc745d89dd8667 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 19 十月 2026 17:23:49 +0800
Subject: [PATCH] fix: 取消设备核查/比对的身份限制与三张设备计划的审批功能
---
src/views/CNAS/resourceDemand/standardMaterial/index.vue | 124 ++++++++---------------------------------
1 files changed, 24 insertions(+), 100 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterial/index.vue b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
index 1c76435..3a58882 100644
--- a/src/views/CNAS/resourceDemand/standardMaterial/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
@@ -19,8 +19,6 @@
</div>
<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,24 +26,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>
- <el-dialog title="鏍囧噯鐗╄川瀵煎叆" v-model="importVisible" width="500px" @closed="resetImport">
- <div style="margin-bottom: 12px;">
- 璇蜂娇鐢ㄦ爣鍑嗙墿璐ㄥ鍏ユā鏉垮～鍐欐暟鎹紝鍗曚釜鏂囦欢涓嶈秴杩�10MB銆�
- <el-button link type="primary" @click="downloadTemplate">涓嬭浇瀵煎叆妯℃澘</el-button>
- </div>
- <el-upload ref="standardSubstanceUpload" drag name="file" accept=".xlsx" :action="importAction"
- :headers="uploadHeader" :auto-upload="false" :limit="1" :file-list="importFiles"
- :before-upload="beforeImport" :on-success="importSuccess" :on-error="importError">
- <lims-icon name="el-icon-upload"></lims-icon>
- <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
- </el-upload>
- <template #footer><span class="dialog-footer">
- <el-button @click="importVisible = false">鍙栨秷</el-button>
- <el-button type="primary" :loading="importing" @click="submitImport">瀵煎叆</el-button>
- </span></template>
- </el-dialog>
+ <borrow-dia v-if="borrowDia" ref="borrowDia" @closeBorrowDia="closeBorrowDia"></borrow-dia>
</div>
</template>
@@ -56,19 +37,16 @@
import {
getPageStandardSubstance,
removeStandardSubstance,
- exportOfStandardSubstanceList,
- downloadStandardSubstanceImportTemplate
+ exportOfStandardSubstanceList
} 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 +71,11 @@
minWidth: '100'
},
{
+ label: '渚涘簲鍟�',
+ prop: 'supplier',
+ minWidth: '120'
+ },
+ {
label: '鍑哄巶缂栧彿',
prop: 'factoryNum',
minWidth: '100'
@@ -108,9 +91,19 @@
minWidth: '100'
},
{
- label: '鏁伴噺',
+ label: '鍘熷鏁伴噺',
prop: 'quantity',
minWidth: '100'
+ },
+ {
+ label: '浣欓噺',
+ prop: 'remainingQuantity',
+ minWidth: '80'
+ },
+ {
+ label: '鍗曚綅',
+ prop: 'unit',
+ minWidth: '80'
},
{
label: '璐疆鏃ユ湡',
@@ -156,18 +149,14 @@
},
},
{
- name: '鍊熺敤',
+ name: '棰嗙敤',
type: 'text',
clickFun: (row) => {
this.borrow(row);
},
- },
- {
- name: '褰掕繕',
- type: 'text',
- clickFun: (row) => {
- this.return(row);
- }
+ disabled: (row) => {
+ return Number(row.remainingQuantity) <= 0;
+ },
},
{
name: '鍒犻櫎',
@@ -190,72 +179,18 @@
total: 0,
formDia: false,
borrowDia: false,
- returnDia: false,
- importVisible: false,
- importing: false,
- importFiles: [],
- }
- },
- computed: {
- importAction() {
- return this.javaApi + '/feStandardSubstance/importStandardSubstance'
}
},
mounted() {
this.searchList()
},
methods: {
- downloadTemplate() {
- downloadStandardSubstanceImportTemplate().then(res => {
- this.$download.saveAs(new Blob([res]), '鏍囧噯鐗╄川瀵煎叆妯℃澘.xlsx')
- })
- },
- submitImport() {
- if (!this.$refs.standardSubstanceUpload.uploadFiles.length) {
- this.$message.warning('璇烽�夋嫨闇�瑕佸鍏ョ殑Excel鏂囦欢')
- return
- }
- this.$refs.standardSubstanceUpload.submit()
- },
- beforeImport(file) {
- if (!file.name.toLowerCase().endsWith('.xlsx')) {
- this.$message.error('浠呮敮鎸�.xlsx鏍煎紡鏂囦欢')
- return false
- }
- if (file.size > 10 * 1024 * 1024) {
- this.$message.error('瀵煎叆鏂囦欢涓嶈兘瓒呰繃10MB')
- return false
- }
- this.importing = true
- return true
- },
- importSuccess(response) {
- this.importing = false
- if (response.code !== 200) {
- this.$message.error(response.message || response.msg || '瀵煎叆澶辫触')
- return
- }
- this.$message.success(`鎴愬姛瀵煎叆${response.data}鏉℃爣鍑嗙墿璐╜)
- this.importVisible = false
- this.searchList()
- },
- importError() {
- this.importing = false
- this.$message.error('瀵煎叆澶辫触')
- },
- resetImport() {
- this.importing = false
- this.importFiles = []
- if (this.$refs.standardSubstanceUpload) {
- this.$refs.standardSubstanceUpload.clearFiles()
- }
- },
exportFun() {
this.outLoading = true
exportOfStandardSubstanceList(this.searchForm).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' }, false);
- this.$download.saveAs(blob, '鏍囧噯鐗╄川娓呭崟.xlsx')
+ this.$download.saveAs(blob, '鏍囧噯鐗╄川鍙拌处.xlsx')
})
},
// 鏌ヨ鍒楄〃
@@ -316,17 +251,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