2026-02-06

增加查询条件

src/views/modules/report/inboundNotificationReport.vue

@@ -93,6 +93,11 @@
                 <el-input v-model="searchData.partDesc" placeholder="请输入物料名称" clearable></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="卷标签">
+                <el-input v-model="searchData.rollNo" placeholder="请输入卷标签" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="4">
               <el-form-item label="要求入库日期(起)">
                 <el-date-picker
@@ -120,6 +125,10 @@
                 <el-input v-model="searchData.queryRelatedOrderNo" placeholder="请输入关联单号" clearable></el-input>
               </el-form-item>
             </el-col>
+          </el-row>
+
+          <!-- 第三行 -->
+          <el-row :gutter="16">
             <el-col :span="4">
               <el-form-item label="关联单行号">
                 <el-input v-model="searchData.queryRelatedOrderLineNo" placeholder="请输入关联单行号" clearable></el-input>
@@ -247,6 +256,7 @@ export default {
         supplierName: '',
         partNo: '',
         partDesc: '',
+        rollNo: '',
         startDate: '',
         endDate: '',
         queryRelatedOrderNo: '',
@@ -330,7 +340,7 @@ export default {
       this.$nextTick(() => {
         const windowHeight = window.innerHeight;
         // 根据搜索条件展开状态动态计算
-        const headerHeight = this.searchExpanded ? 308 : 186;
+        const headerHeight = this.searchExpanded ? 360 : 186;
         this.tableHeight = windowHeight - headerHeight - 105;
       });
     },
@@ -393,6 +403,7 @@ export default {
         supplierName: '',
         partNo: '',
         partDesc: '',
+        rollNo: '',
         startDate: '',
         endDate: '',
         queryRelatedOrderNo: '',

src/views/modules/warehouse/labelTransactionLog.vue

@@ -79,29 +79,34 @@
             </el-col>
           </el-row>
           <el-row :gutter="16">
-            <el-col :span="4">
+            <el-col :span="3">
               <el-form-item label="传输状态">
-                <el-select v-model="searchData.syncedFlag" placeholder="请选择" clearable style="width: 114%">
+                <el-select v-model="searchData.syncedFlag" placeholder="请选择" clearable style="width: 100%">
                   <el-option label="已传输" value="Y"></el-option>
                   <el-option label="待传输" value="N"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="3">
               <el-form-item label="通知单号">
                 <el-input v-model="searchData.documentNo" clearable placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="3">
               <el-form-item label="关联单号">
                 <el-input v-model="searchData.orderNo" clearable placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="3">
               <el-form-item label="关联单行号">
                 <el-input v-model="searchData.orderLineNo" clearable placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="合约号码">
+                <el-input v-model="searchData.batchNo" clearable placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="变动日期">
                 <el-date-picker
@@ -260,6 +265,7 @@ export default {
         documentNo: '',
         orderNo: '',
         orderLineNo: '',
+        batchNo: '',
         syncedFlag: ''
       },
       // 变动类型列表（不包含"变动明细"）
@@ -390,6 +396,7 @@ export default {
         documentNo: this.searchData.documentNo,
         orderNo: this.searchData.orderNo,
         orderLineNo: this.searchData.orderLineNo,
+        batchNo: this.searchData.batchNo,
         syncedFlag: this.searchData.syncedFlag,
         page: this.pageIndex,
         limit: this.pageSize
@@ -427,6 +434,7 @@ export default {
         documentNo: '',
         orderNo: '',
         orderLineNo: '',
+        batchNo: '',
         syncedFlag: ''
       }
       this.initDefaultDate()
@@ -451,6 +459,7 @@ export default {
         documentNo: this.searchData.documentNo,
         orderNo: this.searchData.orderNo,
         orderLineNo: this.searchData.orderLineNo,
+        batchNo: this.searchData.batchNo,
         syncedFlag: this.searchData.syncedFlag,
         userName: this.$store.state.user.name,
         page: 1,