From 55808231eab5125f30019733a2408e0f7f4d5bcc Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Mon, 27 Feb 2023 09:34:05 +0800
Subject: [PATCH] 操作查询页/入库单下发页展示优化
---
ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue | 22 +++++++++++++++-------
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue | 36 ++++++++++--------------------------
2 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue b/ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue
index 48e040f..8186045 100644
--- a/ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue
+++ b/ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue
@@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="业务ID">
- <a-input placeholder="请输入业务ID" v-model="queryParam.bizId"></a-input>
+ <j-input placeholder="请输入业务ID" v-model="queryParam.bizId"></j-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -19,22 +19,30 @@
<j-multi-select-tag placeholder="请选择业务标签" v-model="queryParam.bizTag" dictCode="operation_log_tag"/>
</a-form-item>
</a-col>
- <template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="操作内容">
<j-input placeholder="请输入操作内容" v-model="queryParam.operationMsg"></j-input>
</a-form-item>
</a-col>
- </template>
+ <a-col :xl="10" :lg="11" :md="12" :sm="24">
+ <a-form-item label="创建日期">
+ <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
+ class="query-group-cust" v-model="queryParam.operationTime_begin"></j-date>
+ <span class="query-group-split-cust"></span>
+ <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
+ class="query-group-cust" v-model="queryParam.operationTime_end"></j-date>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="操作结果状态">
+ <a-input placeholder="请输入操作结果状态容" v-model="queryParam.operationStatus"></a-input>
+ </a-form-item>
+ </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="handleExportXls('操作记录')" icon="download" style="margin-left: 8px">导出</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
- <a @click="handleToggleSearch" style="margin-left: 8px">
- {{ toggleSearchStatus ? '收起' : '展开' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
- </a>
</span>
</a-col>
</a-row>
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
index 6482f46..45abc4d 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
@@ -14,13 +14,13 @@
<j-dict-select-tag placeholder="请选择任务类型" v-model="queryParam.taskType" dictCode="receipt_task_type"/>
</a-form-item>
</a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="状态">
+ <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="receipt_container_status"/>
+ </a-form-item>
+ </a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="状态">
- <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="receipt_container_status"/>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="起始库位">
<a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
</a-form-item>
@@ -64,9 +64,8 @@
<div class="table-operator">
<a-button v-has="'receiptContainerHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('入库组盘')">导出</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
- @change="handleImportExcel">
- <a-button type="primary" icon="import">导入</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
@@ -75,12 +74,6 @@
<!-- table区域-begin -->
<div>
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
- style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
- <a style="margin-left: 24px" @click="onClearSelected">清空</a>
- </div>
-
<a-table
ref="table"
size="middle"
@@ -112,28 +105,19 @@
type="primary"
icon="download"
size="small"
- @click="downloadFile(text)">
- 下载
+ @click="downloadFile(text)">下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
- <a-divider type="vertical"/>
<a v-if="record.status == 0 && record.taskType == 200" @click="selectPort(record)">生成任务</a>
<a v-else-if="record.status == 0" @click="createTask(record)">生成任务</a>
<a-divider type="vertical"/>
<a-popconfirm v-if="record.status == 0" v-has="'receiptContainerHeader:delete'" title="确定取消配盘吗?" @confirm="() => handleDelete(record.id)">
- <a>取消配盘</a>
+ <a>取消配盘</a>
</a-popconfirm>
<a-divider type="vertical"/>
- <a-dropdown>
- <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a v-has="'receiptContainerHeader:edit'" @click="handleEdit(record)">编辑</a>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
+ <a v-has="'receiptContainerHeader:edit'" @click="handleEdit(record)">编辑</a>
</span>
</a-table>
--
libgit2 0.22.2