From 159fbf597890e5ee886a9a988484bed3ba1f7474 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Tue, 11 Jan 2022 15:09:45 +0800
Subject: [PATCH] =?UTF-8?q?H=E5=B9=B3=E5=8F=B0=E5=A4=87=E4=BB=B6=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ux/vw/dataInput/hq_h_checkout/detail.vue    | 17 +++++++++--------
 .../ux/vw/dataInput/hq_h_outorder/detail.vue    |  9 +++++++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
index 3bf6e2f7..c97ffa6a 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
@@ -231,20 +231,21 @@ export default {
         prop: "version",
         width: 110,
       });
-      tempsTabs.push({
-        label: "订货看板编号",
-        prop: "kanban",
-        width: 150,
-      });
-      tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
+      // tempsTabs.push({
+      //   label: "订货看板编号",
+      //   prop: "kanban",
+      //   width: 150,
+      // });
+      // tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
       tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 });
       tempsTabs.push({
         label: "物料组(车型)",
         prop: "materialGroup",
         width: 220,
       });
-      tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
-      tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
+      tempsTabs.push({ label: "结算零件号", prop: "extend1", width: 220 });
+      //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
+      tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
       tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
 
       return tempsTabs;
diff --git a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
index b0a4b4c2..fbd57802 100644
--- a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
@@ -36,7 +36,7 @@
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照零件号搜索..."
+        placeholder="按照看板号搜索..."
         style="width: 230px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -231,6 +231,11 @@ export default {
         prop: "version",
         width: 110,
       });
+      tempsTabs.push({
+        label: "订单号",
+        prop: "billNum",
+        width: 170,
+      });
       tempsTabs.push({
         label: "订货看板编号",
         prop: "kanban",
@@ -515,7 +520,7 @@ export default {
       this.getList();
       this.listQuery.Filters = [];
       if (this.searchContent != "") {
-        var column = "materialCode";
+        var column = "billNum";
         let filter = {
           logic: 0,
           column: column,