From 39cac3dd69ef41efca1a7e7781d77105634de840 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 26 Jan 2026 10:24:40 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-26=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/qc/inboundNotification.vue  | 20 +++++++++++++------
 src/views/modules/qc/outboundNotification.vue |  8 ++++----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/qc/inboundNotification.vue b/src/views/modules/qc/inboundNotification.vue
index f2f4342..2c39072 100644
--- a/src/views/modules/qc/inboundNotification.vue
+++ b/src/views/modules/qc/inboundNotification.vue
@@ -24,6 +24,16 @@
           <el-option label="已归档" value="已归档"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'部门'">
+        <el-select v-model="searchData.departmentNo" clearable placeholder="请选择" style="width: 140px">
+          <el-option
+            v-for="item in departmentList"
+            :key="item.departmentNo"
+            :label="item.departmentDesc"
+            :value="item.departmentNo">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'要求入库日期'">
         <el-date-picker
           style="width: 120px"
@@ -139,7 +149,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="单据类型" prop="orderType">
-          <el-select v-model="modalData.orderType" :disabled="modalDisableFlag" style="width: 100px">
+          <el-select v-model="modalData.orderType" placeholder="请选择" :disabled="modalDisableFlag" style="width: 100px">
             <el-option label="生产入库" value="生产入库"></el-option>
             <el-option label="其他入库" value="其他入库"></el-option>
           </el-select>
@@ -162,10 +172,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :rules="rules" ref="modalForm" :model="modalData" style="margin-left: 7px">
         <el-form-item>
-<!--          <span v-if="modalDisableFlag" slot="label">供应商</span>-->
           <span style="cursor: pointer" slot="label" @click="getBaseList(506)"><a href="#">供应商</a></span>
           <el-input v-model="modalData.supplierId" @change="supplierBlur(506)" style="width: 120px"></el-input>
           <el-input v-model="modalData.supplierName" disabled style="width: 223px"></el-input>
@@ -180,8 +187,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" style="margin-left: 7px">
         <el-form-item :label="'备注'">
           <el-input type="textarea" v-model="modalData.remarks" :rows="3" resize='none' show-word-limit style="width: 505px;height: 20px"></el-input>
         </el-form-item>
@@ -764,6 +769,7 @@
           orderType: '',
           orderStatus: '',
           orderStatusList: ['草稿'],
+          departmentNo: '', // 部门查询条件
           startDate: '',
           endDate: '',
           page: 1,
@@ -1286,6 +1292,8 @@
       this.getSiteAndBuByUserName()
       // 校验用户是否收藏
       this.favoriteIsOk()
+      // 加载部门列表（用于查询条件）
+      this.loadDepartmentList()
       // 动态列
       this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
       this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
diff --git a/src/views/modules/qc/outboundNotification.vue b/src/views/modules/qc/outboundNotification.vue
index 5eda216..3939534 100644
--- a/src/views/modules/qc/outboundNotification.vue
+++ b/src/views/modules/qc/outboundNotification.vue
@@ -163,8 +163,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :rules="rules" ref="modalForm" :model="modalData" style="margin-left: 7px">
+<!--      </el-form>-->
+<!--      <el-form :inline="true" label-position="top" :rules="rules" ref="modalForm" :model="modalData" style="margin-left: 7px">-->
         <!-- 采购退货时显示供应商 -->
         <el-form-item v-if="modalData.orderType === '采购退货'">
           <span style="cursor: pointer" slot="label" @click="getBaseList(506)"><a href="#">供应商</a></span>
@@ -187,8 +187,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" style="margin-left: 7px">
+<!--      </el-form>-->
+<!--      <el-form :inline="true" label-position="top" style="margin-left: 7px">-->
         <el-form-item :label="'备注'">
           <el-input type="textarea" v-model="modalData.remarks" :rows="3" resize='none' show-word-limit style="width: 505px;height: 20px"></el-input>
         </el-form-item>