From 213df69780f7aa5c229d12174d8f9758f8cadd8d Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期二, 23 七月 2024 16:30:44 +0800
Subject: [PATCH] 装备电缆-增加能力范围导入接口
---
src/components/view/b1-sample.vue | 562 ++++++-------------------------------------------------
1 files changed, 67 insertions(+), 495 deletions(-)
diff --git a/src/components/view/b1-sample.vue b/src/components/view/b1-sample.vue
index 429f833..192a677 100644
--- a/src/components/view/b1-sample.vue
+++ b/src/components/view/b1-sample.vue
@@ -34,6 +34,7 @@
width: calc(100% - 40px);
height: calc(100% - 60px - 80px - 10px - 40px);
padding: 20px;
+ overflow-y: auto;
}
.el-form-item {
@@ -155,6 +156,9 @@
.custom-tree-node:hover .el-button {
opacity: 1;
}
+ >>>.el-loading-mask {
+ z-index: 10;
+ }
</style>
<template>
@@ -162,7 +166,7 @@
<div style="width: 100%;height: 100%;" v-if="!isDetail">
<div>
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">鏍峰搧绠＄悊</el-col>
+ <el-col :span="12" style="padding-left: 20px;text-align: left;">鏍峰搧绠＄悊</el-col>
<el-col :span="12" style="text-align: right;">
<el-button size="small" type="primary" @click="storageVisible=true">鍏ュ簱</el-button>
<el-button size="small" type="primary" @click="exportVisible=true">鍑哄簱</el-button>
@@ -208,7 +212,7 @@
</div>
</div>
<div class="table" v-loading="tableLoading">
- <table border="1" class="tables" cellpadding="10" style="table-layout:fixed;">
+ <table border="1" class="tables" cellpadding="10" style="table-layout:fixed;" v-if="tableList.length>0">
<tbody>
<tr v-for="(item,index) in tableList" :key="index">
<td v-for="(m,i) in item" :key="i" class="content">
@@ -238,14 +242,15 @@
</tr>
</tbody>
</table>
+ <span v-else style="color: rgb(144, 147, 153);display: inline-block;position: absolute;top: 60%;left: 50%;transform: translate(-50%,-50%);">鏆傛棤鏁版嵁</span>
</div>
</div>
<Detail v-else @hanldeBack="isDetail=false" :id="currentId" />
<el-dialog title="鏍峰搧鍏ュ簱" :visible.sync="storageVisible" width="350px">
- <div class="shaoma">
+ <!-- <div class="shaoma">
<img src="../../../static/img/鎵爜.svg" alt="" style="margin-right: 5px;">
<span>鎵爜鍏ュ簱</span>
- </div>
+ </div> -->
<el-row>
<el-col class="search_thing" :span="24">
<div class="search_label"><span class="required-span">* </span>鏍峰搧缂栧彿锛�</div>
@@ -274,10 +279,10 @@
</span>
</el-dialog>
<el-dialog title="鏍峰搧鍑哄簱" :visible.sync="exportVisible" width="350px">
- <div class="shaoma">
+ <!-- <div class="shaoma">
<img src="../../../static/img/鎵爜.svg" alt="" style="margin-right: 5px;">
<span>鎵爜鍑哄簱</span>
- </div>
+ </div> -->
<el-row>
<el-col class="search_thing" :span="24">
<div class="search_label"><span class="required-span">* </span>鏍峰搧缂栧彿锛�</div>
@@ -291,7 +296,7 @@
<el-button type="primary" @click="confirmExport" :loading="upLoadExport">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="搴撲綅缁存姢" :visible.sync="keepVisible" width="350px">
+ <el-dialog title="搴撲綅缁存姢" :visible.sync="keepVisible" width="350px" :append-to-body="true">
<el-tree :data="warehouse" ref="tree" :props="{ children: 'warehouseShelfList', label: 'name' }" node-key="id"
:filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
@node-collapse="nodeClose" :default-expanded-keys="expandedKeys" v-if="keepVisible"
@@ -301,7 +306,7 @@
<el-col :span="20">
<span><i
:class="`node_i ${node.level<2 ? 'el-icon-folder-opened': 'el-icon-tickets'}`"></i>
- {{ data.name }}{{ node.level }}</span>
+ {{ data.name }}</span>
</el-col>
<el-col :span="4" v-if="node.level<3">
<el-button type="text" size="mini" icon="el-icon-edit" @click.stop="handleEdit(data,node.level)">
@@ -314,7 +319,7 @@
</el-tree>
<span slot="footer" class="dialog-footer">
<el-button @click="keepVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="confirmKeep" :loading="upLoadKeep">纭� 瀹�</el-button>
+ <el-button type="primary" @click="keepVisible = false" >纭� 瀹�</el-button>
</span>
</el-dialog>
<el-dialog :title="isEdit?'浠撳簱淇敼':'浠撳簱鏂板'" :visible.sync="warehouseVisible" width="350px">
@@ -386,463 +391,9 @@
shelvesVisible: false,
upLoadStorage: false,
upLoadExport: false,
- upLoadKeep: false,
upLoadWarehouse: false,
upLoadShelves: false,
- tableList: [
- [{
- title: '1-1-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-2-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-3-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-4-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-5-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-6-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-7-4',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- ],
- [{
- title: '1-1-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-2-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-3-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-4-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-5-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-6-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-7-3',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- ],
- [{
- title: '1-1-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-2-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-3-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-4-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-5-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-6-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-7-2',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- ],
- [{
- title: '1-1-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-2-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-3-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-4-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-5-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-6-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- {
- title: '1-7-1',
- list: [{
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸1',
- num: 20,
- type: 0,
- },
- {
- name: '鍘熸潗鏂�',
- specs: '瑙勬牸2',
- num: 20,
- type: 1,
- },
- ]
- },
- ]
- ],
+ tableList: [],
rowList: [],
value: '',
name:'',
@@ -852,7 +403,7 @@
isEdit: false, //寮规--鏄惁鏄慨鏀�,榛樿涓篺alse
isDetail: false, //璇︽儏--鏄惁灞曠ず涓鸿鎯呴〉闈紝榛樿涓篺alse
currentEdit:null,//褰撳墠瑕佺淮鎶ょ殑淇℃伅
- tableLoading:true,
+ tableLoading:false,
sampleCode:'',
currentId:null,
searchSampleCode:''
@@ -865,6 +416,11 @@
selectList() {
this.$axios.get(this.$api.warehouse.selectWarehouse).then(res => {
this.warehouse = res.data
+ if(res.data.length==0){
+ this.entity.warehouseId = '';
+ this.entity.shelfId = '';
+ this.tableList = []
+ }
this.storageList = this.HaveJson(res.data).map(item=>{
item.warehouseShelfList&&item.warehouseShelfList.length>0&&item.warehouseShelfList.map(m=>{
let warehouseShelfList = [];
@@ -893,6 +449,16 @@
if(this.shelf.length>0){
this.entity.shelfId = this.shelf[0].id
this.handleShelf(this.entity.shelfId)
+ }else{
+ this.tableList = []
+ }
+ }else if(this.warehouse.length>0){
+ this.warehouseChange(this.entity.warehouseId)
+ if(this.shelf.length>0){
+ this.entity.shelfId = this.shelf[0].id
+ this.handleShelf(this.entity.shelfId)
+ }else{
+ this.tableList = []
}
}
})
@@ -955,10 +521,6 @@
this.handleShelf(this.entity.shelfId)
})
},
- // 缁存姢
- confirmKeep() {
- this.upLoadKeep = true;
- },
// 娣诲姞/淇敼浠撳簱
confirmWarehouse() {
if (!this.name) {
@@ -978,6 +540,7 @@
}).then(res => {
this.upLoadWarehouse = false;
this.warehouseVisible = false
+ // this.keepVisible = false
this.currentEdit = null;
if (res.code == 201) {
this.$message.error('淇敼澶辫触')
@@ -985,6 +548,8 @@
}
this.$message.success('淇敼鎴愬姛')
this.selectList()
+ this.name = ''
+ this.warehouseChange(this.entity.warehouseId)
})
}else{
// 鏂板浠撳簱
@@ -999,10 +564,10 @@
}
this.$message.success('娣诲姞鎴愬姛')
this.selectList()
+ this.name = ''
+ this.warehouseChange(this.entity.warehouseId)
})
}
- this.name = ''
- this.warehouseChange(this.entity.warehouseId)
},
// 娣诲姞/淇敼璐ф灦
confirmShelves() {
@@ -1030,11 +595,12 @@
}).then(res => {
this.upLoadShelves = false;
this.shelvesVisible = false
+ // this.keepVisible = false
if (res.code == 201) {
- this.$message.error('娣诲姞澶辫触')
+ this.$message.error('淇敼澶辫触')
return
}
- this.$message.success('娣诲姞鎴愬姛')
+ this.$message.success('淇敼鎴愬姛')
this.selectList()
this.currentEdit ={};
})
@@ -1069,6 +635,7 @@
},
nodeOpen(data, node, el) {
$($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
+ this.selectTree[node.level-1] = data.id;
},
nodeClose(data, node, el) {
$($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
@@ -1133,6 +700,7 @@
this.isDetail = true;
},
warehouseChange(val) {
+ this.tableList = []
let map = this.warehouse.find(a => {
return a.id === val ? a : null
})
@@ -1140,33 +708,37 @@
this.entity.shelfId = '';
},
handleShelf(e){
- this.tableLoading = true;
- this.$axios.get(this.$api.warehouse.getWarehouse+'?shelfId='+e).then(res => {
- let data = res.data;
- let set =new Set()
- this.tableList = [];
- let arr = []
- data.forEach(m=>{
- set.add(m.col)
- if(arr.length>0){
- if(arr.find(n=>n.row==m.row)){
- arr.push(m)
+ if(e){
+ this.tableLoading = true;
+ this.$axios.get(this.$api.warehouse.getWarehouse+'?shelfId='+e).then(res => {
+ this.tableLoading = false;
+ let data = res.data;
+ let set =new Set()
+ this.tableList = [];
+ let arr = []
+ data.forEach(m=>{
+ set.add(m.col)
+ if(arr.length>0){
+ if(arr.find(n=>n.row==m.row)){
+ arr.push(m)
+ }else{
+ this.tableList.push(arr)
+ arr = []
+ arr.push(m)
+ }
}else{
- this.tableList.push(arr)
- arr = []
arr.push(m)
}
- }else{
- arr.push(m)
+ })
+ this.tableList.push(arr)
+ this.rowList = [];
+ for(let i=0;i<set.size;i++){
+ this.rowList.push(`${i+1} 鍒梎)
}
+ }).catch(e=>{
+ this.tableLoading = false;
})
- this.tableList.push(arr)
- this.rowList = [];
- for(let i=0;i<set.size;i++){
- this.rowList.push(`${i+1} 鍒梎)
- }
- this.tableLoading = false;
- })
+ }
},
handleSearch(){
if(!this.searchSampleCode){
--
Gitblit v1.9.3