From bd7f9985d283a7950c2a29f4d8a2d027f8b45b9d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 26 十一月 2025 14:09:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/gyMaterial/GyMaterial.vue | 76 +++++++++----------------------------
1 files changed, 19 insertions(+), 57 deletions(-)
diff --git a/src/views/gyMaterial/GyMaterial.vue b/src/views/gyMaterial/GyMaterial.vue
index b1246a2..6aab067 100644
--- a/src/views/gyMaterial/GyMaterial.vue
+++ b/src/views/gyMaterial/GyMaterial.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding: 10px">
+ <div style="padding: 10px; position: relative;">
<el-card style="margin-bottom: 10px;">
<el-form :inline="true" :model="queryParams" ref="queryForm" class="mb8">
<el-form-item label="鐗╂枡浠ｇ爜" prop="HNumber">
@@ -50,11 +50,11 @@
placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�"
style="width: 160px"
/>
- <el-button type="primary" @click="handleResCnz" style="margin-left: 10px">閲嶆柊鍚屾</el-button>
+ <el-button type="primary" size="mini" @click="handleResCnz" style="margin-left: 10px">閲嶆柊鍚屾</el-button>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" @click="handleQuery">鎼滅储</el-button>
- <el-button @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-form :model="queryParams" ref="filterForm">
@@ -208,9 +208,8 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
- type="warning"
+ type="primary"
plain
- icon="el-icon-upload2"
size="mini"
@click="handleImport"
>瀵煎叆</el-button
@@ -218,9 +217,8 @@
</el-col>
<el-col :span="1.5">
<el-button
- type="warning"
+ type="primary"
plain
- icon="el-icon-download"
size="mini"
@click="handleExport"
>瀵煎嚭</el-button
@@ -229,8 +227,6 @@
<el-col :span="1.5">
<el-button
type="primary"
- plain
- icon="el-icon-document"
size="mini"
@click="handleNumAdd"
>娴佹按鍙锋柊澧�</el-button
@@ -239,8 +235,6 @@
<el-col :span="1.5">
<el-button
type="primary"
- plain
- icon="el-icon-plus"
size="mini"
@click="handleAdd"
>鏂板</el-button
@@ -248,9 +242,6 @@
</el-col>
<el-col :span="1.5">
<el-button
- type="success"
- plain
- icon="el-icon-document-copy"
size="mini"
:disabled="single"
@click="handleCopy"
@@ -259,9 +250,6 @@
</el-col>
<el-col :span="1.5">
<el-button
- type="success"
- plain
- icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleEdit"
@@ -271,8 +259,6 @@
<el-col :span="1.5">
<el-button
type="danger"
- plain
- icon="el-icon-delete"
size="mini"
:disabled="single"
@click="handleDelete"
@@ -281,9 +267,6 @@
</el-col>
<el-col :span="1.5">
<el-button
- type="success"
- plain
- icon="el-icon-check"
size="mini"
:disabled="single"
@click="handleAudit(0)"
@@ -292,9 +275,6 @@
</el-col>
<el-col :span="1.5">
<el-button
- type="success"
- plain
- icon="el-icon-close"
size="mini"
:disabled="single"
@click="handleAudit(1)"
@@ -303,9 +283,6 @@
</el-col>
<el-col :span="1.5">
<el-button
- type="warning"
- plain
- icon="el-icon-turn-off"
size="mini"
:disabled="single"
@click="handleStop(0)"
@@ -314,9 +291,6 @@
</el-col>
<el-col :span="1.5">
<el-button
- type="warning"
- plain
- icon="el-icon-open"
size="mini"
:disabled="single"
@click="handleStop(1)"
@@ -325,9 +299,6 @@
</el-col>
<el-col :span="1.5">
<el-button
- type="info"
- plain
- icon="el-icon-setting"
size="mini"
@click="handleColumnSetting"
>鍒楄缃�</el-button
@@ -335,9 +306,6 @@
</el-col>
<el-col :span="1.5">
<el-button
- type="info"
- plain
- icon="el-icon-s-operation"
size="mini"
@click="handleButtonSetting"
>鎸夐挳璁剧疆</el-button
@@ -346,8 +314,6 @@
<el-col :span="1.5">
<el-button
type="primary"
- plain
- icon="el-icon-folder-checked"
size="mini"
@click="handleSaveScheme"
>淇濆瓨鏂规</el-button
@@ -356,8 +322,6 @@
<el-col :span="1.5">
<el-button
type="primary"
- plain
- icon="el-icon-folder-opened"
size="mini"
@click="handleReadScheme"
>璇诲彇鏂规</el-button
@@ -365,9 +329,6 @@
</el-col>
<el-col :span="1.5">
<el-button
- type="info"
- plain
- icon="el-icon-refresh"
size="mini"
@click="handleRefresh"
>鍒锋柊</el-button
@@ -375,9 +336,6 @@
</el-col>
<el-col :span="1.5">
<el-button
- type="info"
- plain
- icon="el-icon-close"
size="mini"
@click="handleExit"
>閫�鍑�</el-button
@@ -386,8 +344,6 @@
<el-col :span="1.5">
<el-button
type="primary"
- plain
- icon="el-icon-edit"
size="mini"
@click="handleCorrect"
>鎵规敼</el-button
@@ -396,8 +352,6 @@
<el-col :span="1.5">
<el-button
type="primary"
- plain
- icon="el-icon-edit"
size="mini"
@click="handleCorrect2"
>鎵规敼(鏂规2)</el-button
@@ -583,8 +537,8 @@
append-to-body
>
<div style="margin-top: -20px">
- <el-button type="primary" @click="handleImportSubmit">瀵煎叆鏁版嵁</el-button>
- <el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
+ <el-button type="primary" size="mini" @click="handleImportSubmit">瀵煎叆鏁版嵁</el-button>
+ <el-button type="primary" size="mini" @click="upload.open = false">閫� 鍑�</el-button>
<el-upload
ref="upload"
:limit="1"
@@ -595,7 +549,7 @@
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
>
- <el-button type="primary">鏂囦欢涓婁紶</el-button>
+ <el-button type="primary" size="mini">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
<el-table
@@ -1204,6 +1158,9 @@
this.$refs.tableData.toggleRowSelection(row);
this.selectedRow = row;
this.getFileList(row.鐗╂枡浠ｇ爜);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 3)
+ }
},
@@ -1262,18 +1219,23 @@
// 琛屾牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.hmainid)) {
+ if (this.ids.includes(row.HItemID)) {
return { background: "#ecf5ff" };
}
},
// 鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 3)
+ } else {
this.handleMaterialCodeClick(row);
+ }
},
handleSelectionChange(selection) {
- this.ids = selection.map((item) => item.hmainid);
+ console.log(selection)
+ this.ids = selection.map((item) => item.HItemID);
this.single = selection.length != 1;
this.multiple = !selection.length;
if (!this.single) {
--
Gitblit v1.9.1