From 341606c0511c8b7acac80f977a99105262ec94dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Wed, 4 Mar 2026 16:15:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=8D=AE=E7=9B=B8=E5=85=B3=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=88=97=E5=8F=8A=E7=8A=B6=E6=80=81=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在基础面板组件中添加发货计划、发货单据和发货状态的展示列
新增showWaybill属性控制相关列的显示
---
 klp-ui/src/views/wms/coil/panels/base.vue | 41 +++++++++++++++++++++++
 klp-ui/src/views/wms/coil/waybill.vue     | 33 ++++++++++++++++++
 klp-ui/src/views/wms/hrm/dept/index.vue   |  2 +-
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 klp-ui/src/views/wms/coil/waybill.vue

diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 33107ccb..72b75f3e 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -163,6 +163,43 @@
           </el-select>
         </template>
       </el-table-column>
+
+      <el-table-column label="发货计划" align="center" prop="nextWarehouseId" v-if="showWaybill" width="150">
+        <template slot-scope="scope">
+          {{ scope.row.bindPlanName || '-' }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="发货单据" align="center" prop="nextWarehouseId" v-if="showWaybill" width="150">
+        <template slot-scope="scope">
+          <el-popover placement="top" width="400" trigger="hover">
+            <div>
+              <el-descriptions :column="2" :border="false">
+                <el-descriptions-item label="单据名称">
+                  {{ scope.row.bindWaybillName || '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="车牌号">
+                  {{ scope.row.bindLicensePlate || '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="收货单位">
+                  {{ scope.row.bindConsigneeUnit || '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="负责人">
+                  {{ scope.row.bindPrincipal || '-' }}
+                </el-descriptions-item>
+              </el-descriptions>
+            </div>
+            <div slot="reference" class="text-ellipsis" v-text>{{ scope.row.bindLicensePlate || '-' }}</div>
+          </el-popover>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="发货状态" align="center" prop="status" v-if="showWaybill" width="150">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status === 1" type="success" size="mini">已发货</el-tag>
+          <el-tag v-else type="info" size="mini">未发货</el-tag>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -445,6 +482,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    showWaybill: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
diff --git a/klp-ui/src/views/wms/coil/waybill.vue b/klp-ui/src/views/wms/coil/waybill.vue
new file mode 100644
index 00000000..fc67658a
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/waybill.vue
@@ -0,0 +1,33 @@
+<template>
+  <BasePage 
+    :qrcode="qrcode" 
+    :showWaybill="showWaybill"
+    :querys="querys" :labelType="labelType" :showStatus="showStatus" :hideType="hideType" :showControl="showControl" :showExportTime="showExportTime" />
+</template>
+
+<script>
+import BasePage from './panels/base.vue';
+
+export default {
+  components: {
+    BasePage
+  },
+  data() {
+    return {
+      qrcode: false,
+      querys: {
+        dataType: 1,
+        includeBindInfo: true,
+        // materialType: '成品',
+        // status: 1
+      },
+      showControl: false,
+      labelType: '3',
+      showStatus: false,
+      hideType: false,
+      showExportTime: false,
+      showWaybill: true,
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/hrm/dept/index.vue b/klp-ui/src/views/wms/hrm/dept/index.vue
index fc891394..59e7a411 100644
--- a/klp-ui/src/views/wms/hrm/dept/index.vue
+++ b/klp-ui/src/views/wms/hrm/dept/index.vue
@@ -87,7 +87,7 @@
         </el-form-item>
         <el-form-item label="部门负责人" prop="leader">
           <!-- <el-input v-model="form.leader" placeholder="请输入部门负责人" /> -->
-          <el-select v-model="form.leader" placeholder="请选择部门负责人">
+          <el-select filterable v-model="form.leader" placeholder="请选择部门负责人">
             <el-option v-for="item in userOptions" :key="item.id" :label="item.label" :value="item.id" />
           </el-select>
         </el-form-item>