From b8e554b2db1933319eedc2a1b9e6a013dce6e299 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 23 十二月 2024 18:05:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/platform/components/WaybillDetail.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/platform/components/WaybillDetail.vue b/admin/src/views/platform/components/WaybillDetail.vue
index f3a4446..4cbabfa 100644
--- a/admin/src/views/platform/components/WaybillDetail.vue
+++ b/admin/src/views/platform/components/WaybillDetail.vue
@@ -1,5 +1,5 @@
<template>
- <GlobalWindow title="杩愬崟璇︽儏" center :visible.sync="isShowModal" width="600px" :confirm-working="subLoading"
+ <GlobalWindow title="杩愬崟璇︽儏" center :visible.sync="isShowModal" width="800px" :confirm-working="subLoading"
@confirm="isShowModal = false">
<div class="detail_modal">
<div class="head">
@@ -16,7 +16,7 @@
</div>
<div class="item">
<span>鎬昏繍杈撻噺锛�</span>
- <span>{{ info.ioQty }}涓囨敮</span>
+ <span>{{ info.ioQty || info.totalNum }}涓囨敮</span>
</div>
<div class="item">
<span>椹鹃┒鍛橈細</span>
@@ -29,13 +29,14 @@
<div class="item" v-for="item in info.wmsJobContractVOList">
<div class="contract">
<span>鍚堝悓鍙凤細{{ item.contractCode }}</span>
- <div>
+ <!-- <div> -->
<span class="scs" v-if="item.status == 1">WMS浣滀笟宸插畬鎴�</span>
<span class="pad" v-if="item.status == 0">WMS浣滀笟鏈畬鎴�</span>
<span class="err" v-if="item.status == 2">WMS浣滀笟宸插彇娑�</span>
+
<span class="scs" v-if="item.lockStatus == 1">鐢靛瓙閿佸凡涓婇攣</span>
<span class="pad" v-if="item.lockStatus == 0">鐢靛瓙閿佹湭涓婇攣</span>
- </div>
+ <!-- </div> -->
</div>
<div class="placeholder6">鏀惰揣鍦帮細{{ item.address }}</div>
<div class="list">
--
Gitblit v1.9.3