From 4f21a887865ed0429df6fb70f798857dfc5be035 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 05 四月 2024 17:15:04 +0800
Subject: [PATCH] #
---
pages/phyz/stationManage/stationDetl.vue | 6 ++++--
pages/phyz/stationManage/stationManage.vue | 14 ++++++++------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index aa56d75..1881917 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -11,7 +11,7 @@
<view>绔欑偣鐘舵�侊細{{station.locSts$}}</view>
<view class="mt-flex">
<view class="station-barcode" style="flex: 1">璐ф灦鐮侊細<text>{{station.barcode ? station.barcode : '--'}}</text></view>
- <view v-if="station.barcode"><button size="mini" type="warn" @click="unbind()">瑙i櫎缁戝畾</button></view>
+ <view v-if="station.barcode && station.locSts == 'F'"><button size="mini" type="warn" @click="unbind()">瑙i櫎缁戝畾</button></view>
</view>
</view>
@@ -20,7 +20,7 @@
<view class="wrkMast">
<view class="wrkMast-wrkNo">
<view style="flex:3">宸ヤ綔鍙�: {{wrkMast.wrkNo}}</view>
- <view style="flex:2">{{wrkMast.ioTitle}}</view>
+ <view style="flex:2;text-align: right;">{{wrkMast.ioTitle}}</view>
</view>
<view>宸ヤ綔绫诲瀷: {{wrkMast.ioType$}}</view>
<view>婧愬簱浣�: {{wrkMast.sourceLocNo}}</view>
@@ -320,6 +320,8 @@
_this.btnType = 'out'
} else if (res.data.records[0].ioType == 103) {
res.data.records[0]['ioTitle'] = '鎷f枡鍑哄簱'
+ } else if (res.data.records[0].ioType == 110) {
+ res.data.records[0]['ioTitle'] = '绌烘澘鍑哄簱'
}
_this.wrkMast = res.data.records[0]
_this.getWrkDetl(_this.wrkMast.wrkNo)
diff --git a/pages/phyz/stationManage/stationManage.vue b/pages/phyz/stationManage/stationManage.vue
index 04e4a5a..4bc7cd2 100644
--- a/pages/phyz/stationManage/stationManage.vue
+++ b/pages/phyz/stationManage/stationManage.vue
@@ -162,14 +162,15 @@
}
_this.stations = res.data.records
} else {
+ console.log(123213);
for (let item of res.data.records) {
- _this.station = item
- if (item.barcode) {
- _this.getWrkMast(item.barcode)
- _this.getWaitPakin(item.barcode)
-
+ if (item.locSts != 'O') {
+ item['style'] = 'station-wrk'
} else {
+ item['style'] = 'station-nowrk'
}
+ _this.station = item
+ _this.getOrderDetl(_this.station)
}
}
@@ -377,7 +378,8 @@
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
res.eventChannel.emit('item', {
item: item
- })
+ }),
+ _this.searchValue = ''
},
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
--
Gitblit v1.9.1