From 79a30b927dc7a0d3281b10e989c7a3d2ab8a98a4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 09 五月 2024 10:10:15 +0800
Subject: [PATCH] 修改样品管理bug
---
src/components/view/b1-sample.vue | 535 +++++------------------------------------------------------
1 files changed, 47 insertions(+), 488 deletions(-)
diff --git a/src/components/view/b1-sample.vue b/src/components/view/b1-sample.vue
index d35359e..70d036c 100644
--- a/src/components/view/b1-sample.vue
+++ b/src/components/view/b1-sample.vue
@@ -156,6 +156,9 @@
.custom-tree-node:hover .el-button {
opacity: 1;
}
+ >>>.el-loading-mask {
+ z-index: 10;
+ }
</style>
<template>
@@ -209,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">
@@ -239,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>
@@ -275,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>
@@ -315,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">
@@ -387,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:'',
@@ -853,7 +403,7 @@
isEdit: false, //寮规--鏄惁鏄慨鏀�,榛樿涓篺alse
isDetail: false, //璇︽儏--鏄惁灞曠ず涓鸿鎯呴〉闈紝榛樿涓篺alse
currentEdit:null,//褰撳墠瑕佺淮鎶ょ殑淇℃伅
- tableLoading:true,
+ tableLoading:false,
sampleCode:'',
currentId:null,
searchSampleCode:''
@@ -866,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 = [];
@@ -894,12 +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 = []
}
}
})
@@ -961,10 +520,6 @@
this.$message.success('鍑哄簱鎴愬姛')
this.handleShelf(this.entity.shelfId)
})
- },
- // 缁存姢
- confirmKeep() {
- this.upLoadKeep = true;
},
// 娣诲姞/淇敼浠撳簱
confirmWarehouse() {
@@ -1152,33 +707,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