From cfa025e9af98a4a90a1be98af01c1771eaea4f04 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 9 Feb 2026 13:58:20 +0800
Subject: [PATCH] =?UTF-8?q?2026-02-09=20=E6=94=B6=E8=B4=A7=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=92=8C=E6=8B=A3=E8=B4=A7=E5=87=BA=E5=BA=93=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../soIssueNotify/searchIssureNotify.vue      |  7 ++--
 src/views/modules/qc/inboundNotification.vue  |  2 +-
 src/views/modules/qc/outboundNotification.vue | 18 ++++++++++-
 .../report/inboundNotificationReport.vue      | 32 +++++++++++++++++--
 .../report/outboundNotificationReport.vue     | 32 +++++++++++++++++--
 5 files changed, 83 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
index e76c56d..0ffa66d 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
@@ -468,7 +468,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="'出库类别'">
+            <el-form-item :label="'出库类别'" prop="category">
               <el-select v-model="notifyData.category" clearable placeholder="请选择" style="width: 100%">
                 <el-option
                   v-for="item in categoryList"
@@ -1168,6 +1168,9 @@
           ],
           workCenterNo: [
             { required: true, message: '请选择车间', trigger: 'change' }
+          ],
+          category: [
+            { required: true, message: '请选择出库类别', trigger: 'change' }
           ]
         },
         closeData:{
@@ -4162,7 +4165,7 @@
       loadCategoryList () {
         getOutboundCategoryList({}).then(({data}) => {
           if (data && data.code === 0) {
-            this.categoryList = data.rows || []
+            this.categoryList = (data.rows || []).sort((a, b) => (a.crdcode || '').localeCompare(b.crdcode || ''))
           }
         })
       },
diff --git a/src/views/modules/qc/inboundNotification.vue b/src/views/modules/qc/inboundNotification.vue
index 4dc1231..2f119b2 100644
--- a/src/views/modules/qc/inboundNotification.vue
+++ b/src/views/modules/qc/inboundNotification.vue
@@ -2219,7 +2219,7 @@
       loadCategoryList () {
         getInboundCategoryList({}).then(({data}) => {
           if (data && data.code === 0) {
-            this.categoryList = data.rows || []
+            this.categoryList = (data.rows || []).sort((a, b) => (a.crdcode || '').localeCompare(b.crdcode || ''))
           }
         })
       },
diff --git a/src/views/modules/qc/outboundNotification.vue b/src/views/modules/qc/outboundNotification.vue
index c6759bd..5b45e14 100644
--- a/src/views/modules/qc/outboundNotification.vue
+++ b/src/views/modules/qc/outboundNotification.vue
@@ -58,6 +58,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="部门">
+                <el-select v-model="searchData.departmentNo" placeholder="请选择" clearable style="width: 100%">
+                  <el-option
+                    v-for="item in departmentList"
+                    :key="item.departmentNo"
+                    :label="item.departmentDesc"
+                    :value="item.departmentNo">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="4">
               <el-form-item label="要求出库日期(起)">
                 <el-date-picker
@@ -836,6 +848,7 @@
           orderType: '',
           orderStatus: '',
           orderStatusList: ['草稿'],
+          departmentNo: '', // 部门查询条件
           startDate: '',
           endDate: '',
           createdStartDate: '', // 创建时间开始
@@ -1345,6 +1358,8 @@
       this.getSiteAndBuByUserName()
       // 校验用户是否收藏
       this.favoriteIsOk()
+      // 加载部门列表（用于查询条件）
+      this.loadDepartmentList()
       // 动态列
       this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
       this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
@@ -1381,6 +1396,7 @@
           orderType: '',
           orderStatus: '',
           orderStatusList: ['草稿'],
+          departmentNo: '',
           startDate: '',
           endDate: '',
           createdStartDate: '',
@@ -2256,7 +2272,7 @@
       loadCategoryList () {
         getOutboundCategoryList({}).then(({data}) => {
           if (data && data.code === 0) {
-            this.categoryList = data.rows || []
+            this.categoryList = (data.rows || []).sort((a, b) => (a.crdcode || '').localeCompare(b.crdcode || ''))
           }
         })
       },
diff --git a/src/views/modules/report/inboundNotificationReport.vue b/src/views/modules/report/inboundNotificationReport.vue
index 9f9c54f..abbf7b8 100644
--- a/src/views/modules/report/inboundNotificationReport.vue
+++ b/src/views/modules/report/inboundNotificationReport.vue
@@ -134,6 +134,18 @@
                 <el-input v-model="searchData.queryRelatedOrderLineNo" placeholder="请输入关联单行号" clearable></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="部门">
+                <el-select v-model="searchData.departmentNo" placeholder="请选择部门" clearable style="width: 100%">
+                  <el-option
+                    v-for="item in departmentList"
+                    :key="item.departmentNo"
+                    :label="item.departmentDesc"
+                    :value="item.departmentNo">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
         </template>
 
@@ -241,6 +253,7 @@
 
 <script>
 import { searchInboundNotificationReport, getSiteList } from "@/api/report/inboundNotificationReport.js";
+import { getDepartmentList } from "@/api/qc/Inbound_notification.js";
 
 export default {
   name: "inboundNotificationReport",
@@ -260,10 +273,13 @@ export default {
         startDate: '',
         endDate: '',
         queryRelatedOrderNo: '',
-        queryRelatedOrderLineNo: ''
+        queryRelatedOrderLineNo: '',
+        departmentNo: ''
       },
       // Site列表
       siteList: [],
+      // 部门列表
+      departmentList: [],
       // 搜索展开状态
       searchExpanded: true,
       // 加载状态
@@ -297,6 +313,7 @@ export default {
         { columnProp: 'rollNo', columnLabel: '卷标签', columnWidth: '150', headerAlign: 'center', align: 'left' },
         { columnProp: 'inBatchNo', columnLabel: '批次号', columnWidth: '120', headerAlign: 'center', align: 'left' },
         { columnProp: 'detailInWarehouseName', columnLabel: '明细入库仓库', columnWidth: '120', headerAlign: 'center', align: 'center' },
+        { columnProp: 'departmentName', columnLabel: '部门', columnWidth: '120', headerAlign: 'center', align: 'center' },
         { columnProp: 'createdBy', columnLabel: '创建人', columnWidth: '100', headerAlign: 'center', align: 'center' },
         { columnProp: 'createdDate', columnLabel: '创建时间', columnWidth: '150', headerAlign: 'center', align: 'center' },
         { columnProp: 'remarks', columnLabel: '备注', columnWidth: '200', headerAlign: 'center', align: 'left' }
@@ -320,6 +337,7 @@ export default {
         '卷标签': 'rollNo',
         '批次号': 'inBatchNo',
         '明细入库仓库': 'detailInWarehouseName',
+        '部门': 'departmentName',
         '创建人': 'createdBy',
         '创建时间': 'createdDate',
         '备注': 'remarks'
@@ -328,6 +346,7 @@ export default {
   },
   created() {
     this.getSiteList();
+    this.loadDepartmentList();
     this.calculateTableHeight();
     window.addEventListener('resize', this.calculateTableHeight);
   },
@@ -407,7 +426,8 @@ export default {
         startDate: '',
         endDate: '',
         queryRelatedOrderNo: '',
-        queryRelatedOrderLineNo: ''
+        queryRelatedOrderLineNo: '',
+        departmentNo: ''
       };
       this.pageIndex = 1;
     },
@@ -427,6 +447,14 @@ export default {
       const num = parseFloat(rateStr.replace('%', ''));
       return isNaN(num) ? 0 : Math.min(num, 100);
     },
+    // 加载部门列表
+    loadDepartmentList() {
+      getDepartmentList({}).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.departmentList = data.rows || [];
+        }
+      });
+    },
     // 根据完成率获取进度条颜色
     getProgressColor(percentage) {
       if (percentage >= 100) {
diff --git a/src/views/modules/report/outboundNotificationReport.vue b/src/views/modules/report/outboundNotificationReport.vue
index 88f06d5..e618c97 100644
--- a/src/views/modules/report/outboundNotificationReport.vue
+++ b/src/views/modules/report/outboundNotificationReport.vue
@@ -134,6 +134,18 @@
                 <el-input v-model="searchData.queryOutBatchNo" placeholder="请输入合约号码" clearable></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="部门">
+                <el-select v-model="searchData.departmentNo" placeholder="请选择部门" clearable style="width: 100%">
+                  <el-option
+                    v-for="item in departmentList"
+                    :key="item.departmentNo"
+                    :label="item.departmentDesc"
+                    :value="item.departmentNo">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
         </template>
 
@@ -241,6 +253,7 @@
 
 <script>
 import { searchOutboundNotificationReport, getSiteList } from "@/api/report/outboundNotificationReport.js";
+import { getDepartmentList } from "@/api/qc/outbound_notification.js";
 
 export default {
   name: "outboundNotificationReport",
@@ -260,10 +273,13 @@ export default {
         endDate: '',
         queryRelatedOrderNo: '',
         queryRelatedOrderLineNo: '',
-        queryOutBatchNo: ''
+        queryOutBatchNo: '',
+        departmentNo: ''
       },
       // Site列表
       siteList: [],
+      // 部门列表
+      departmentList: [],
       // 搜索展开状态
       searchExpanded: true,
       // 加载状态
@@ -299,6 +315,7 @@ export default {
         { columnProp: 'outBatchNo', columnLabel: '合约号', columnWidth: '120', headerAlign: 'center', align: 'left' },
         { columnProp: 'detailOutWarehouseName', columnLabel: '明细出库仓库', columnWidth: '120', headerAlign: 'center', align: 'center' },
         { columnProp: 'inspectionFlag', columnLabel: '送检标志', columnWidth: '80', headerAlign: 'center', align: 'center' },
+        { columnProp: 'departmentName', columnLabel: '部门', columnWidth: '120', headerAlign: 'center', align: 'center' },
         { columnProp: 'createdBy', columnLabel: '创建人', columnWidth: '100', headerAlign: 'center', align: 'center' },
         { columnProp: 'createdDate', columnLabel: '创建时间', columnWidth: '150', headerAlign: 'center', align: 'center' },
         { columnProp: 'remarks', columnLabel: '备注', columnWidth: '200', headerAlign: 'center', align: 'left' }
@@ -324,6 +341,7 @@ export default {
         '合约号': 'outBatchNo',
         '明细出库仓库': 'detailOutWarehouseName',
         '送检标志': 'inspectionFlag',
+        '部门': 'departmentName',
         '创建人': 'createdBy',
         '创建时间': 'createdDate',
         '备注': 'remarks'
@@ -332,6 +350,7 @@ export default {
   },
   created() {
     this.getSiteList();
+    this.loadDepartmentList();
     this.calculateTableHeight();
     window.addEventListener('resize', this.calculateTableHeight);
   },
@@ -411,7 +430,8 @@ export default {
         endDate: '',
         queryRelatedOrderNo: '',
         queryRelatedOrderLineNo: '',
-        queryOutBatchNo: ''
+        queryOutBatchNo: '',
+        departmentNo: ''
       };
       this.pageIndex = 1;
     },
@@ -431,6 +451,14 @@ export default {
       const num = parseFloat(rateStr.replace('%', ''));
       return isNaN(num) ? 0 : Math.min(num, 100);
     },
+    // 加载部门列表
+    loadDepartmentList() {
+      getDepartmentList({}).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.departmentList = data.rows || [];
+        }
+      });
+    },
     // 根据完成率获取进度条颜色
     getProgressColor(percentage) {
       if (percentage >= 100) {