From 78ff08f56ce152912269a7dbaaaf36e4b03be213 Mon Sep 17 00:00:00 2001
From: git_rabbit <zhaozhengyi1b@126.com>
Date: Tue, 24 Feb 2026 12:43:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8D=E8=89=AF=E5=93=81=E5=BA=93=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=92=8C=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在仓库选项中添加不良品库(WH007)
- 在物料位置管理中增加不良品类型选项
- 将审批人输入框改为可筛选的下拉选择框
- 新增工单批量打印功能，支持多选工单后调用打印接口
---
 src/utils/warehouse.js                        |  3 +-
 .../productionMaterial/MmLocation.vue         |  4 ++
 .../components/WorkorderDefectDialog.vue      |  4 +-
 .../productManagement/ProWorkorder/index.vue  | 44 ++++++++++++++++++-
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/utils/warehouse.js b/src/utils/warehouse.js
index 56b0aad..eeea4ed 100644
--- a/src/utils/warehouse.js
+++ b/src/utils/warehouse.js
@@ -5,5 +5,6 @@ export const warehouseOptions = [
     { warehouseCode: 'WH004', warehouseName: '退货库' },
     { warehouseCode: 'WH005', warehouseName: '转用库' },
     { warehouseCode: 'WH006', warehouseName: '报废库' },
+    { warehouseCode: 'WH007', warehouseName: '不良品库' }
     // 更多仓库...
-]
\ No newline at end of file
+]
diff --git a/src/views/materialManagement/productionMaterial/MmLocation.vue b/src/views/materialManagement/productionMaterial/MmLocation.vue
index ffe1783..4776b67 100644
--- a/src/views/materialManagement/productionMaterial/MmLocation.vue
+++ b/src/views/materialManagement/productionMaterial/MmLocation.vue
@@ -318,6 +318,10 @@ const state = reactive({
                 dictValue: '退货',
                 dictLabel: '退货'
             },
+            {
+                dictValue: '不良品',
+                dictLabel: '不良品'
+            },
             {
                 dictValue: '转用',
                 dictLabel: '转用'
diff --git a/src/views/productManagement/ProWorkorder/components/WorkorderDefectDialog.vue b/src/views/productManagement/ProWorkorder/components/WorkorderDefectDialog.vue
index 6566093..2c7a29a 100644
--- a/src/views/productManagement/ProWorkorder/components/WorkorderDefectDialog.vue
+++ b/src/views/productManagement/ProWorkorder/components/WorkorderDefectDialog.vue
@@ -130,7 +130,9 @@
                     </el-col>
                     <el-col :lg="12">
                         <el-form-item label="审批人" prop="approver">
-                            <el-input v-model="approveForm.approver" placeholder="请输入审批人姓名" />
+                            <el-select v-model="approveForm.approver" filterable placeholder="请选择审批人">
+                                <el-option v-for="item in userOptions" :key="item.userId" :label="item.nickName" :value="item.nickName" />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :lg="24">
diff --git a/src/views/productManagement/ProWorkorder/index.vue b/src/views/productManagement/ProWorkorder/index.vue
index 7358c14..9691072 100644
--- a/src/views/productManagement/ProWorkorder/index.vue
+++ b/src/views/productManagement/ProWorkorder/index.vue
@@ -75,6 +75,11 @@
             <el-col :span="1.5">
                 <el-button class="tool-box" color="#00aa00" icon="Upload" @click="handleExport"> 工单导出 </el-button>
             </el-col>
+            <el-col :span="1.5">
+                <el-button class="tool-box" color="#ff6600" icon="Printer" @click="handlePrint" :disabled="selectedWorkorders.length === 0">
+                    批量打印
+                </el-button>
+            </el-col>
             <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
@@ -87,8 +92,9 @@
             size="small"
             header-row-class-name="table-header"
             :cell-class-name="tableCellClassName"
-            @sort-change="sortChange">
-            <el-table-column type="index" width="50" align="center" />
+            @sort-change="sortChange"
+            @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
             <el-table-column prop="priority" label="优先级" align="center">
                 <template #default="scope">
                     <dict-tag :options="options.priorityOptions" :value="scope.row.priority" />
@@ -441,6 +447,9 @@ const defectDialogVisible = ref(false)
 const selectedWorkorderId = ref(null)
 const selectedWorkorderInfo = ref({})
 
+// 多选相关变量
+const selectedWorkorders = ref([])
+
 var dictParams = []
 
 const allList = ref([])
@@ -1068,6 +1077,37 @@ function handleDefectSubmit(data) {
     getList()
 }
 
+// 处理表格多选
+function handleSelectionChange(selection) {
+    selectedWorkorders.value = selection
+}
+
+// 处理批量打印
+function handlePrint() {
+    if (selectedWorkorders.value.length === 0) {
+        proxy.$modal.msgWarning('请选择要打印的工单')
+        return
+    }
+
+    // 提取选中的工单号为数组
+    const workorderArray = selectedWorkorders.value.map((item) => item.workorder)
+    // path暂时为空字符串
+    const path = ''
+
+    // 调用printByBarTender API
+    printByBarTender({ workorderArray, path })
+        .then((res) => {
+            if (res.code === 200) {
+                proxy.$modal.msgSuccess('打印请求已发送')
+            } else {
+                proxy.$modal.msgError('打印失败: ' + res.msg)
+            }
+        })
+        .catch((error) => {
+            proxy.$modal.msgError('打印失败: ' + error.message)
+        })
+}
+
 // initDict()
 getMaterialCodeList()
 handleQuery()