订单采购 按日期搜索

订单采购 按日期搜索

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java

@@ -82,7 +82,6 @@ public class PurchaseOrderPageReqVO extends PageParam {
     private String creator;
 
     @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String createTime;
-    private LocalDateTime[] createTime;
 
 }

mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue

@@ -573,7 +573,7 @@ const submitForm = async () => {
     isRepeat = true
   })
   if(isRepeat){
-    await message.alert("子项目简称重复")
+    await message.alert("子项目简称不能重复！")
     return
   }
   // 提交请求

mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue

@@ -7,30 +7,37 @@
       <!-- 搜索工作栏 -->
       <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="158px">
         <el-form-item label="采购单号" prop="purchaseNo">
-          <el-input v-model="queryParams.purchaseNo" placeholder="采购单号" clearable @keyup.enter="handleQuery" class="!w-240px" />
+          <el-input v-model="queryParams.purchaseNo" placeholder="采购单号" clearable @keyup.enter="handleQuery"
+            class="!w-240px" />
         </el-form-item>
         <el-form-item label="单据日期" prop="createTime">
-          <el-date-picker class="!w-240px" v-model="queryParams.createTime" type="date" value-format="x" placeholder="单据日期" />
+        <el-date-picker class="!w-265px" v-model="queryParams.createTime" type="date" value-format="x"
-        </el-form-item>
+          placeholder="单据日期" />
+      </el-form-item>
         <el-form-item label="供应商" prop="supplierName">
-          <el-input v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.enter="handleQuery" class="!w-240px" />
+          <el-input v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.enter="handleQuery"
+            class="!w-240px" />
         </el-form-item>
         <el-form-item label="采购单类型" prop="purchaseType">
           <el-select v-model="queryParams.purchaseType" placeholder="下拉选择" clearable class="!w-240px">
-            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PURCHASE_ORDER_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PURCHASE_ORDER_TYPE)" :key="dict.value"
+              :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="物料需求计划单号" prop="materialPlanNo">
-          <el-input v-model="queryParams.materialPlanNo" placeholder="物料需求计划单号" clearable @keyup.enter="handleQuery" class="!w-240px" />
+          <el-input v-model="queryParams.materialPlanNo" placeholder="物料需求计划单号" clearable @keyup.enter="handleQuery"
+            class="!w-240px" />
         </el-form-item>
         <el-form-item label="采购物类型" prop="goodsType">
           <el-select v-model="queryParams.goodsType" placeholder="下拉选择" clearable class="!w-240px">
-            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PURCHASE_GOODS_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PURCHASE_GOODS_TYPE)" :key="dict.value"
+              :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="单据状态" prop="status">
           <el-select v-model="queryParams.status" placeholder="下拉选择" clearable class="!w-240px">
-            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PURCHASE_ORDER_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PURCHASE_ORDER_STATUS)" :key="dict.value"
+              :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item style="margin-left:50px">
@@ -55,7 +62,8 @@
 
     <!-- 列表 -->
     <ContentWrap>
-      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table" @selection-change="handleSelectionChange" @row-click="clickRow" selection>
+      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table"
+        @selection-change="handleSelectionChange" @row-click="clickRow" selection>
         <el-table-column type="selection" align="center" fixed width="70" />
         <el-table-column fixed label="序号" type="index" width="60" />
         <el-table-column label="采购单号" align="center" prop="purchaseNo" fixed min-width="190">
@@ -65,13 +73,13 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column label="单据日期" align="center" prop="createTime" :formatter="dateFormatter" min-width="180" fixed>
+        <el-table-column label="单据日期" align="center" prop="createTime" :formatter="dateFormatter" min-width="180px" fixed>
-          <template #default="scope">
+        <template #default="scope">
-            {{
+          {{
             formatDate(scope.row.createTime, 'YYYY-MM-DD')
           }}
-          </template>
+        </template>
-        </el-table-column>
+      </el-table-column>
         <el-table-column label="供应商" align="center" min-width="180" prop="supplierName" fixed />
         <el-table-column label="采购单类型" align="center" prop="purchaseType" min-width="120">
           <template #default="scope">
@@ -100,11 +108,12 @@
           </template>
         </el-table-column>
         <el-table-column label="操作" align="right" fixed="right" min-width="180">
-            <template #header> 
+          <template #header>
-              <span style="margin-right: 30%">操作</span> 
+            <span style="margin-right: 30%">操作</span>
-         </template>
+          </template>
           <template #default="scope">
-            <el-button link type="primary" @click="openForm('edit', scope.row.id)" v-if="scope.row.status == 1 || scope.row.status == 4">
+            <el-button link type="primary" @click="openForm('edit', scope.row.id)"
+              v-if="scope.row.status == 1 || scope.row.status == 4">
               编辑
             </el-button>
             <el-button link type="primary" @click="openForm('detail', scope.row.id)">
@@ -114,11 +123,11 @@
         </el-table-column>
       </el-table>
       <!-- 分页 -->
-      <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+        @pagination="getList" />
     </ContentWrap>
 
   </el-card>
-
 </template>
 
 <script setup lang="ts">
@@ -180,6 +189,7 @@ const getList = async () => {
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
+  queryParams.createTime= formatDate(queryParams.createTime, 'YYYY-MM-DD')
   getList()
 }
 
@@ -188,8 +198,8 @@ const resetQuery = () => {
   queryFormRef.value.resetFields()
   handleQuery()
 }
-const multipleTable:any = ref<InstanceType<typeof ElTable>>()
+const multipleTable: any = ref<InstanceType<typeof ElTable>>()
-const multipleSelection:any = ref([])
+const multipleSelection: any = ref([])
 
 const handleSelectionChange = (val: PurchaseOrderApi.PurchaseOrderVO[]) => {
   multipleSelection.value = val
@@ -197,11 +207,11 @@ const handleSelectionChange = (val: PurchaseOrderApi.PurchaseOrderVO[]) => {
 }
 
 const clickRow = (row: any) => {
- if(row){
+  if (row) {
-   multipleTable.value!.toggleRowSelection(row, undefined)
+    multipleTable.value!.toggleRowSelection(row, undefined)
- }else{
+  } else {
-  multipleTable.value!.clearSelection()
+    multipleTable.value!.clearSelection()
- }
+  }
 }
 /** 添加/修改操作 */
 const openForm = (type: string, id?: number) => {
@@ -233,9 +243,9 @@ const handleDelete = async (id: number) => {
   } catch { }
 }
 
-const getIds = async ()=>{
+const getIds = async () => {
   queryParams.ids = []
-  multipleSelection.value.forEach(item=>{
+  multipleSelection.value.forEach(item => {
     queryParams.ids.push(item.id)
   })
 }
@@ -254,7 +264,7 @@ const handleExport = async () => {
     exportLoading.value = false
   }
 }
-const handleExportWithTax = async ()=>{
+const handleExportWithTax = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()