Эх сурвалжийг харах

申请单搜索条件申请时间与审批时间改为区间查询

002390 1 жил өмнө
parent
commit
266af3977a

+ 50 - 16
src/views/material/requisition/columns.js

@@ -116,14 +116,14 @@
         clearable: true,
       },
     },
-    {
-      item: { key: "createTimeString", title: "申请时间" },
-      attr: {
-        is: "el-date-picker", 
-        valueFormat: "yyyy-MM-dd" ,
-        clearable: true,
-      },
-    },
+    // {
+    //   item: { key: "createTimeString", title: "申请时间" },
+    //   attr: {
+    //     is: "el-date-picker", 
+    //     valueFormat: "yyyy-MM-dd" ,
+    //     clearable: true,
+    //   },
+    // },
     {
       item: { key: "reviewedName", title: "最后审批人" },
       attr: {
@@ -136,14 +136,14 @@
         clearable: true,
       },
     },
-    {
-      item: { key: "auditTimeString", title: "审批时间" },
-      attr: {
-        is: "el-date-picker", 
-        valueFormat: "yyyy-MM-dd" ,
-        clearable: true,
-      },
-    },
+    // {
+    //   item: { key: "auditTimeString", title: "审批时间" },
+    //   attr: {
+    //     is: "el-date-picker", 
+    //     valueFormat: "yyyy-MM-dd" ,
+    //     clearable: true,
+    //   },
+    // },
     {
       item: { key: "manufacturerName", title: "生产厂家/代理人" },
       attr: {
@@ -163,6 +163,40 @@
         is: "el-input",
       },
     },
+    {
+      item:{
+        key: "createTimeString",
+        title: "申请时间",
+        span:12,
+      },
+      attr: {
+        clearable:true,
+        // is: "el-date-wrapper",
+        is: "el-date-picker",
+        type:"daterange",
+        rangeSeparator:"-",
+        startPlaceholder:"开始日期",
+        endPlaceholder:"结束日期",
+        valueFormat:"yyyy-MM-dd",
+      },
+    },
+    
+    {
+      item:{
+        key: "auditTimeString",
+        title: "审批时间",
+        span:12,
+      },
+      attr: {
+        clearable:true,
+        is: "el-date-picker",
+        type:"daterange",
+        rangeSeparator:"-",
+        startPlaceholder:"开始日期",
+        endPlaceholder:"结束日期",
+        valueFormat:"yyyy-MM-dd",
+      },
+    },
     
   
   ].map(({ item, attr }) => ({