From 9eaf758e97367dbc2eca2bdbdc92ab39e08be9d0 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周四, 15 5月 2025 13:12:17 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems.PDA/pages/pick/index.vue | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
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