From 5f2d0c7f95dc635862d54229be6a0b0f3cc97d0e Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Fri, 29 May 2026 15:50:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demandOrder/index.vue    | 50 ++++++++++++++++++++++++++++++
 src/views/purchaseOrders/index.vue | 42 +++++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/src/views/demandOrder/index.vue b/src/views/demandOrder/index.vue
index 82c6ea6..121328c 100644
--- a/src/views/demandOrder/index.vue
+++ b/src/views/demandOrder/index.vue
@@ -50,6 +50,44 @@ export default {
         columnBtn: false,
         searchMenuPosition: "right",
         column: [
+           {
+            label: "年份",
+            prop: "year",
+            search: true,
+            headerAlign: "center",
+            align: "center",
+            hide: true,
+            type:'year',
+            valueFormat: "yyyy",
+            format: "yyyy",
+          },
+          {
+            label: "季度",
+            prop: "quarter",
+            search: true,
+            headerAlign: "center",
+            align: "center",
+            type: "select",
+            dicData:[
+              {
+                label:'第一季度',
+                value:'1'
+              },
+              {
+                label:'第二季度',
+                value:'2'
+              },
+              {
+                label:'第三季度',
+                value:'3'
+              },
+              {
+                label:'第四季度',
+                value:'4'
+              }
+            ],
+            hide: true,
+          },
           {
             label: "需求单号",
             prop: "demandNo",
@@ -71,12 +109,14 @@ export default {
             prop: "materialName",
             headerAlign: "center",
             align: "center",
+            search:true
           },
           {
             label: "型号",
             prop: "model",
             headerAlign: "center",
             align: "center",
+            seaarch:true
           },
           {
             label: "数量",
@@ -101,6 +141,16 @@ export default {
             prop: "department",
             headerAlign: "center",
             align: "center",
+            type: "select",
+            search:true,
+            filterable: true,
+            dicUrl:'/smartpark/department/getOnePutDepartment',
+            props:{
+              label: 'department',
+              value: 'departmentId',
+              res: 'result'
+            }
+
           }
         ]
       },
diff --git a/src/views/purchaseOrders/index.vue b/src/views/purchaseOrders/index.vue
index de40003..4fc34b3 100644
--- a/src/views/purchaseOrders/index.vue
+++ b/src/views/purchaseOrders/index.vue
@@ -48,19 +48,60 @@ export default {
         filterBtn: false,
         columnBtn: false,
         searchMenuPosition: "right",
+        // searchLabelWidth:'auto',
         column: [
+          {
+            label: "年份",
+            prop: "year",
+            search: true,
+            headerAlign: "center",
+            align: "center",
+            hide: true,
+            type:'year',
+            valueFormat: "yyyy",
+            format: "yyyy",
+          },
+          {
+            label: "季度",
+            prop: "quarter",
+            search: true,
+            headerAlign: "center",
+            align: "center",
+            type: "select",
+            dicData:[
+              {
+                label:'第一季度',
+                value:'1'
+              },
+              {
+                label:'第二季度',
+                value:'2'
+              },
+              {
+                label:'第三季度',
+                value:'3'
+              },
+              {
+                label:'第四季度',
+                value:'4'
+              }
+            ],
+            hide: true,
+          },
           {
             label: "采购单号",
             prop: "purchaseNo",
             search: true,
             headerAlign: "center",
             align: "center",
+
           },
           {
             label: "物资名称",
             prop: "materialName",
             headerAlign: "center",
             align: "center",
+             search: true,
           },
           // {
           //   label: "物资Id",
@@ -73,6 +114,7 @@ export default {
             prop: "model",
             headerAlign: "center",
             align: "center",
+             search: true,
           },
           {
             label: "单位",