From 7c0eaf011a06a3b5578fef0ae7b61c8c923e0c97 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 28 十月 2024 11:23:54 +0800
Subject: [PATCH] 正式库配置
---
src/components/view/b1-sample.vue | 609 ++++++++++--------------------------------------------
1 files changed, 115 insertions(+), 494 deletions(-)
diff --git a/src/components/view/b1-sample.vue b/src/components/view/b1-sample.vue
index d35359e..c7a18b0 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>
@@ -163,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>
@@ -192,7 +195,7 @@
<div class="search_thing">
<div class="search_label">鏍峰搧缂栧彿锛�</div>
<div class="search_input">
- <el-input placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" v-model="searchSampleCode" size="small">
+ <el-input placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" v-model="searchSampleCode" size="small" autocomplete="off" ref="organization" readonly="readonly" @focus="remove('organization')" @blur="setType('organization')">
<el-button slot="append" icon="el-icon-search" @click="handleSearch"></el-button>
</el-input>
</div>
@@ -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">
@@ -219,7 +222,7 @@
effect="dark"
placement="top"
v-for="(n,j) in m.samples"
- :key="j" :disabled="`${n.sample}${n.model}`.length<10">
+ :key="j" :disabled="`${n.sample}${n.model}`.length<5">
<div slot="content"><span>{{ n.sample }}</span>
<span> ({{ n.model }}) [{{ n.sampleCode }}]</span></div>
<li class="green"
@@ -239,19 +242,20 @@
</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>
<div class="search_input">
- <el-input v-model="sampleCode" size="small"></el-input>
+ <el-input v-model="sampleCode" size="small" @change="sampleCodeChange"></el-input>
</div>
</el-col>
</el-row>
@@ -275,15 +279,15 @@
</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>
<div class="search_input">
- <el-input v-model="sampleCode" size="small"></el-input>
+ <el-input v-model="sampleCode" size="small" @change="sampleCodeChange" clearable></el-input>
</div>
</el-col>
</el-row>
@@ -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">
@@ -362,6 +366,7 @@
<el-button type="primary" @click="confirmShelves" :loading="upLoadShelves">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <input type="password" id="ScanCodeInfo" v-model="codeInfo" @keyup.enter="keyup" style="opacity: 0;height: 0px;margin: 0px;padding: 0px;position: absolute;top: 0;"></input>
</div>
</template>
@@ -378,6 +383,7 @@
shelfId: null
},
warehouse: [],
+ startTime: null,
shelf: [],
storageList:[],
storageVisible: false,
@@ -387,463 +393,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,19 +405,72 @@
isEdit: false, //寮规--鏄惁鏄慨鏀�,榛樿涓篺alse
isDetail: false, //璇︽儏--鏄惁灞曠ず涓鸿鎯呴〉闈紝榛樿涓篺alse
currentEdit:null,//褰撳墠瑕佺淮鎶ょ殑淇℃伅
- tableLoading:true,
+ tableLoading:false,
sampleCode:'',
currentId:null,
- searchSampleCode:''
+ searchSampleCode:null,
+ codeInfo:null,
+ }
+ },
+ watch:{
+ storageVisible(newVal){
+ if(newVal){
+ // this.$message.success('鎵爜锛氭墦寮�')
+ let input = document.getElementById('ScanCodeInfo');
+ input.focus();
+ this.startTime = setInterval(()=>{
+ input.focus()
+ },1000)
+ }else{
+ // this.$message.warning('鎵爜锛氬叧闂�')
+ clearInterval(this.startTime)
+ }
+ },
+ exportVisible(newVal){
+ if(newVal){
+ // this.$message.success('鎵爜锛氭墦寮�')
+ let input = document.getElementById('ScanCodeInfo');
+ input.focus();
+ this.startTime = setInterval(()=>{
+ input.focus()
+ },1000)
+ }else{
+ // this.$message.warning('鎵爜锛氬叧闂�')
+ clearInterval(this.startTime)
+ }
+ },
+ isEdit(newVal){
+ if(!newVal){
+ this.shelves = {}
+ }
}
},
mounted() {
this.selectList()
},
methods: {
+ keyup(e){
+ var code = ''
+ try{
+ code = this.codeInfo.substring()
+ if(code==null||code==undefined||code==''){
+ this.$message.error('璇ヤ簩缁寸爜鏈夎')
+ }else{
+ this.sampleCode = code
+ }
+ }catch(e){
+ this.$message.error('璇疯皟鑷宠嫳鏂囬敭鐩�')
+ }
+ this.codeInfo = null
+ },
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 +499,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 +570,6 @@
this.$message.success('鍑哄簱鎴愬姛')
this.handleShelf(this.entity.shelfId)
})
- },
- // 缁存姢
- confirmKeep() {
- this.upLoadKeep = true;
},
// 娣诲姞/淇敼浠撳簱
confirmWarehouse() {
@@ -1145,6 +750,7 @@
this.isDetail = true;
},
warehouseChange(val) {
+ this.tableList = []
let map = this.warehouse.find(a => {
return a.id === val ? a : null
})
@@ -1152,33 +758,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){
@@ -1192,6 +802,17 @@
this.isDetail = true;
}
})
+ },
+ sampleCodeChange(e){
+ if(e){
+ this.sampleCode = e.replaceAll('"','')
+ }
+ },
+ remove(type){
+ this.$refs[type].$el.querySelector('input').removeAttribute('readonly')
+ },
+ setType(type){
+ this.$refs[type].$el.querySelector('input').setAttribute('readonly', 'true')
}
}
}
--
Gitblit v1.9.3