From 89811115b88cdb396e265d44bb1b698b91e07618 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 4 Oct 2021 23:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/SerialNumberList.vue     | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/jshERP-web/src/views/system/SerialNumberList.vue b/jshERP-web/src/views/system/SerialNumberList.vue
index b8a99fdc..091fbc40 100644
--- a/jshERP-web/src/views/system/SerialNumberList.vue
+++ b/jshERP-web/src/views/system/SerialNumberList.vue
@@ -59,8 +59,11 @@
                 <a>删除</a>
               </a-popconfirm>
             </span>
-            <span slot="numberCustomRender" slot-scope="text, record">
-              <a @click="myHandleDetail(record)">{{record.depotHeadNumber}}</a>
+            <span slot="inBillNoCustomRender" slot-scope="text, record">
+              <a @click="myHandleDetail(record.inBillNo)">{{record.inBillNo}}</a>
+            </span>
+            <span slot="outBillNoCustomRender" slot-scope="text, record">
+              <a @click="myHandleDetail(record.outBillNo)">{{record.outBillNo}}</a>
             </span>
             <!-- 状态渲染模板 -->
             <template slot="customRenderFlag" slot-scope="isSell">
@@ -127,16 +130,20 @@
           {title: '商品名称', align: "center",dataIndex: 'materialName', width: 120},
           {title: '仓库', align: "center", dataIndex: 'depotName', width: 150},
           {
-            title: '单据编号', align: "center", dataIndex: 'depotHeadNumber', width: 150,
-            scopedSlots: { customRender: 'numberCustomRender' },
+            title: '入库单号', align: "center", dataIndex: 'inBillNo', width: 150,
+            scopedSlots: { customRender: 'inBillNoCustomRender' },
+          },
+          {
+            title: '出库单号', align: "center", dataIndex: 'outBillNo', width: 150,
+            scopedSlots: { customRender: 'outBillNoCustomRender' },
           },
           {title: '已卖出', align: "center", dataIndex: 'isSell', width: 60,
             scopedSlots: { customRender: 'customRenderFlag' }
           },
-          {title: '创建时间',align: "center",  dataIndex: 'createTime', width: 180,
+          {title: '创建时间',align: "center",  dataIndex: 'createTime', width: 160,
             scopedSlots: { customRender: 'customRenderTime' }
           },
-          {title: '更新时间', align: "center", dataIndex: 'updateTime', width: 180,
+          {title: '更新时间', align: "center", dataIndex: 'updateTime', width: 160,
             scopedSlots: { customRender: 'customRenderTime' }
           },
           {
@@ -174,10 +181,10 @@
           this.$refs.modalForm.isReadOnly = true
         }
       },
-      myHandleDetail(record) {
-        findBillDetailByNumber({ number: record.depotHeadNumber }).then((res) => {
+      myHandleDetail(billNo) {
+        findBillDetailByNumber({ number: billNo }).then((res) => {
           if (res && res.code === 200) {
-            this.handleDetail(res.data, record.depotHeadType);
+            this.handleDetail(res.data, res.data.depotHeadType);
           }
         })
       }