From 0bcf02d706053d7ec9e040d8b2caec220d5d5142 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 15 5月 2025 09:02:41 +0800
Subject: [PATCH] 21222
---
PipeLineLems.PDA/pages/home/index.vue | 6 +++---
PipeLineLems.PDA/pages/bind/index.vue | 2 +-
PipeLineLems.PDA/pages/pick/index.vue | 39 ++++++++++++++++++++++-----------------
3 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/PipeLineLems.PDA/pages/bind/index.vue b/PipeLineLems.PDA/pages/bind/index.vue
index b737d55..8e8d0de 100644
--- a/PipeLineLems.PDA/pages/bind/index.vue
+++ b/PipeLineLems.PDA/pages/bind/index.vue
@@ -16,7 +16,7 @@
<EasyPicker :visible.sync="ctVisible" :list="ContainerType" labelField="value" valueField="code"
@select="getTypeVal" />
- <scan-input-form-item v-show="Boolean(containerInfo.containerNo)" class="forma-item" label="鐗╂枡浜岀淮鐮�" v-model="form.materialNo" :msg="msg.material"
+ <scan-input-form-item class="forma-item" label="鐗╂枡浜岀淮鐮�" v-model="form.materialNo" :msg="msg.material"
:msg-type="msgType.material" @search="onSearchMaterial" @clear="onClearMaterial" />
<!-- <scan-input-form-item v-show="Boolean(containerInfo.containerNo)" placeholder="璇烽�夋嫨" :clearable="false" :hasScan="false" :hasSearch="false"
diff --git a/PipeLineLems.PDA/pages/home/index.vue b/PipeLineLems.PDA/pages/home/index.vue
index f4a6c52..ed0b5d7 100644
--- a/PipeLineLems.PDA/pages/home/index.vue
+++ b/PipeLineLems.PDA/pages/home/index.vue
@@ -111,10 +111,10 @@
this.blocks = [{
workShopName: '鍒嗘嫞',
wmsPdaPowerOutput:[
- // {icon:'icon-worker',code:'bind',name:'缁勭洏',color:'#1e90ff'},
+ {icon:'icon-worker',code:'bind',name:'缁勭洏',color:'#1e90ff'},
{icon:'icon-worker',code:'pick',name:'鍒嗘嫞',color:'#1e90ff'},
- // {icon:'icon-worker',code:'bindInForLocation',name:'鍒嗘嫞',color:'#1e90ff'},
- // {icon:'icon-worker',code:'bindWXJ',name:'鍒嗘嫞',color:'#1e90ff'},
+ {icon:'icon-worker',code:'bindInForLocation',name:'缁勭洏2',color:'#1e90ff'},
+ {icon:'icon-worker',code:'bindWXJ',name:'缁勭洏3',color:'#1e90ff'},
]
},
{
diff --git a/PipeLineLems.PDA/pages/pick/index.vue b/PipeLineLems.PDA/pages/pick/index.vue
index 2b890a1..94f90d9 100644
--- a/PipeLineLems.PDA/pages/pick/index.vue
+++ b/PipeLineLems.PDA/pages/pick/index.vue
@@ -20,17 +20,6 @@
:msg-type="msgType.material"
@search="onSearchMaterial"
@clear="onClearMaterial"
-
- />
- <scan-input-form-item
- placeholder="璇烽�夋嫨"
- :clearable="false"
- :hasScan="false"
- :hasSearch="false"
- @click.native="visible = true"
- class="forma-item"
- label="閫夋嫨搴撳彛"
- v-model="form.site"
/>
<EasyPicker :visible.sync="visible" :list="placeList.filter(item=>item.placeNo!='ZDCR')" labelField="placeNo" valueField="placeNo" @select="getSiteVal"/>
<!-- <EasyPicker :visible.sync="visible" :list="placeList" labelField="placeNo" valueField="placeNo" @select="getSiteVal" /> -->
@@ -197,13 +186,29 @@
return false;
}
this.msg.material = '';
+ debugger
+ // 瑙ｆ瀽绠℃缂栫爜銆佺娈靛悕绉板拰鑸瑰彿
+ const parts = this.form.pipeSpecCode.split(',');
+ if (parts.length < 2) {
+ this.msg.material = '鐮佹牸寮忎笉姝ｇ‘锛岃妫�鏌ヨ緭鍏�';
+ return false;
+ }
+ const pipeCode = parts[0];
+ const pipeName = parts.length > 1? parts[1] : '';
+ const shipNo = parts.length > 2? parts[2] : '';
+
try {
- let { result } = await getContainerInfo({ ContainerNo: this.form.pipeSpecCode });
- if (result.containerNo == this.form.containterCode) {
- return this.$modal('褰撳墠绌烘墭涓庢墭鐩橀噸澶�');
- }
- var isExit = this.contaninerData.some((item) => item.containerNo == result.containerNo);
- isExit ? '' : this.contaninerData.push(result);
+ // let { result } = await getContainerInfo({ ContainerNo: this.form.pipeSpecCode });
+ // if (result.containerNo == this.form.containterCode) {
+ // return this.$modal('褰撳墠绌烘墭涓庢墭鐩橀噸澶�');
+ // }
+ // var isExit = this.materialList.some((item) => item.materialNo == pipeCode);
+ // if(isExit){
+ // return this.$modal('褰撳墠绠℃缂栫爜'+pipeCode+'宸茬粡鍦ㄦ墭鐩�'+this.form.containerNo+'涓�');
+ // }
+ // 鏇存柊鎻愮ず淇℃伅
+ this.msg.material = `绠℃缂栫爜:${pipeCode},绠℃鍚嶇О:${pipeName},鑸瑰彿:${shipNo}`;
+ this.form.pipeSpecCode=pipeCode;
} catch (e) {
//TODO handle the exception
console.log(e);
--
Gitblit v1.9.3