From 487c8f5caeaefbc38faadca66467e8aed8d9ffbe Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 06 五月 2024 21:26:53 +0800
Subject: [PATCH] 标准库修复完成
---
src/components/view/b2-standard.vue | 107 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 89 insertions(+), 18 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 20262ee..5398949 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -78,7 +78,7 @@
}
.standard .has-gutter .el-table__cell .cell {
- line-height: 38px;
+ line-height: 34px;
background-color: #f8f8f8;
}
@@ -114,7 +114,7 @@
style="height:calc(100% - 30px);overflow-y: scroll;scrollbar-width: none;">
<div class="custom-tree-node" slot-scope="{ node, data }">
<el-row style="width: 100%;">
- <el-col :span="21" :class="{sort:node.level>3}">
+ <el-col :span="21" :class="{sort:node.level>3}" :title="data.label">
<span><i
:class="`node_i ${data.children != undefined ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
{{ data.code }} {{ data.label }}</span>
@@ -142,9 +142,9 @@
<!-- </el-col> -->
</el-row>
<el-row class="standard_table" v-loading="tableLoad">
- <el-table class="el-table" :data="standardList" style="width: 100%;height: 220px !important;overflow-y: auto;" tooltip-effect="dark"
- highlight-current-row @row-click="rowClick" ref="standard">
- <el-table-column prop="code" label="鏍囧噯缂栧彿" show-overflow-tooltip width="180">
+ <el-table class="el-table" :data="standardList" style="width: 100%;" height="220"
+ tooltip-effect="dark" highlight-current-row @row-click="rowClick" ref="standard">
+ <el-table-column prop="code" label="鏍囧噯缂栧彿" show-overflow-tooltip width="200">
<template slot-scope="scope">
<span style="color: red;font-size: 14px;">{{scope.row['code']}}</span>
</template>
@@ -166,6 +166,7 @@
@select="upProductSelect" @select-all="handleAll">
<el-table-column type="selection" width="65">
</el-table-column>
+ <el-table-column prop="model" label="鍨嬪彿" min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="inspectionItemClassify" label="妫�楠岄」绫诲瀷" width="120" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
@@ -202,6 +203,11 @@
<el-table-column prop="manHour" label="宸ユ椂(H)" width="90" show-overflow-tooltip></el-table-column>
<el-table-column prop="manHourGroup" label="宸ユ椂鍒嗙粍" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="section" label="鍖洪棿" width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="section" label="鎿嶄綔" width="120">
+ <template slot-scope="scope">
+ <el-button type="text" @click="sectionUp(scope.row)">鍖洪棿璁剧疆</el-button>
+ </template>
+ </el-table-column>
</el-table>
</el-row>
</div>
@@ -270,6 +276,29 @@
<span slot="footer" class="dialog-footer">
<el-button @click="addProductDia = false">鍙� 娑�</el-button>
<el-button type="primary" @click="addStandardProductDo" :loading="addLoad3">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="鍖洪棿璁剧疆" :visible.sync="sectionUpDia" width="500px">
+ <div class="body" style="padding: 5px 0;">
+ <el-table :data="sectionList" border style="width: 100%" height="350px">
+ <el-table-column type="index" label="搴忓彿" width="70" align="center">
+ </el-table-column>
+ <el-table-column label="鍖洪棿" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.thing" clearable></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="70" align="center">
+ <template slot-scope="scope">
+ <el-button size="mini" type="danger" icon="el-icon-minus" circle @click="sectionList.splice(scope.$index, 1)"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="sectionUpDia = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="sectionLoadAdd" :loading="sectionLoad">淇� 瀛�</el-button>
+ <el-button type="primary" @click="sectionList.push({thing: ''})" icon="el-icon-plus"></el-button>
</span>
</el-dialog>
</div>
@@ -350,7 +379,11 @@
selectField: {},
},
expandedKeys: [],
- filters: []
+ filters: [],
+ sectionUpDia: false,
+ sectionLoad: false,
+ sectionRow: null,
+ sectionList: []
}
},
mounted() {
@@ -432,10 +465,10 @@
},
deleteStandard(arr, label) {
arr.forEach((item, index) => {
- if(item.label == label){
+ if (item.label == label) {
arr.splice(index, 1);
- }else{
- item.children&&this.deleteStandard(item.children, label);
+ } else {
+ item.children && this.deleteStandard(item.children, label);
}
})
},
@@ -457,7 +490,7 @@
category: "瀛愬疄楠屽"
}).then(res => {
this.factory = []
- res.data.forEach(a=>{
+ res.data.forEach(a => {
this.filters.push({
text: a.label,
value: a.value
@@ -592,14 +625,14 @@
this.$message.success('娣诲姞鎴愬姛')
this.addDia = false
this.list
- .find(a => a.label == this.addOb.factory).children
- .find(a => a.label == this.addOb.laboratory).children
- .find(a => a.label == this.addOb.sampleType).children
- .find(a => a.label == this.addOb.sample).children.push({
- code:'[5]',
- label: this.addOb.model,
- value: this.addOb.model,
- })
+ .find(a => a.label == this.addOb.factory).children
+ .find(a => a.label == this.addOb.laboratory).children
+ .find(a => a.label == this.addOb.sampleType).children
+ .find(a => a.label == this.addOb.sample).children.push({
+ code: '[5]',
+ label: this.addOb.model,
+ value: this.addOb.model,
+ })
this.addLoad = false
}).catch(e => {
this.addDia = false
@@ -838,6 +871,44 @@
return m
})
}
+ },
+ sectionUp(row) {
+ this.sectionRow = row
+ this.sectionUpDia = true
+ this.sectionList = []
+ if(this.sectionRow.section!==null){
+ JSON.parse(this.sectionRow.section).forEach(a=>{
+ this.sectionList.push({
+ thing: a
+ })
+ })
+ }
+ },
+ sectionLoadAdd() {
+ let sectionList = []
+ this.sectionList.forEach(a=>{
+ if(a.thing!==''){
+ sectionList.push(a.thing)
+ }
+ })
+ this.sectionRow.section = JSON.stringify(sectionList)
+ this.sectionLoad = true
+ this.$axios.post(this.$api.standardTree.upStandardProductList, {
+ id: this.sectionRow.id,
+ section: this.sectionRow.section
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.sectionLoad = false
+ if (res.code == 201) {
+ this.$message.error('鏈繚瀛�')
+ return
+ }
+ this.$message.success('宸蹭繚瀛�')
+ this.sectionUpDia = false
+ })
}
}
}
--
Gitblit v1.9.3