java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改报表时间

dev-xx
马远东 9 months ago
parent
87040c03fd
commit
1a0430ac45
10 changed files with 145 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/option/warehouse/warehouseRetentionRecord.js
  2. 21
      src/views/reportforms/DeliveryCustomers.vue
  3. 42
      src/views/reportforms/DeliveryDetails.vue
  4. 23
      src/views/reportforms/DeliveryTrainNumber.vue
  5. 20
      src/views/reportforms/InventoryOutbound.vue
  6. 20
      src/views/reportforms/InventoryReceipt.vue
  7. 19
      src/views/reportforms/Selfpickupreport.vue
  8. 20
      src/views/reportforms/Selfpickuptask.vue
  9. 20
      src/views/reportforms/Stockordertable.vue
  10. 42
      src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue

14
src/option/warehouse/warehouseRetentionRecord.js
Unescape View File

@ -24,7 +24,7 @@ export const columnList = [
{
prop: 'trainNumber',
label: '车次号',
type: 1,
type:2,
values: '',
width: '180',
checkarr: [],
@ -34,7 +34,7 @@ export const columnList = [
{
prop: 'reservationCode',
label: '预约编号',
type: 1,
type: 2,
values: '',
width: '180',
checkarr: [],
@ -44,7 +44,7 @@ export const columnList = [
{
prop: 'waybillNumber',
label: '运单号',
type: 1,
type: 2,
values: '',
width: '180',
checkarr: [],
@ -66,7 +66,7 @@ export const columnList = [
{
prop: 'orderPackageCode',
label: '包条码',
type: 1,
type:2,
values: '',
width: '180',
checkarr: [],
@ -101,7 +101,7 @@ export const columnList = [
{
prop: 'retentionScanTime',
label: '滞留扫描时间',
type: 1,
type: 4,
values: '',
width: '180',
checkarr: [],
@ -111,7 +111,7 @@ export const columnList = [
{
prop: 'retentionScanUsername',
label: '滞留操作人',
type: 1,
type: 2,
values: '',
width: '180',
checkarr: [],
@ -132,7 +132,7 @@ export const columnList = [
{
prop: 'warehouseName',
label: '仓库名称',
type: 1,
type:2,
values: '',
width: '180',
checkarr: [],

21
src/views/reportforms/DeliveryCustomers.vue
Unescape View File

@ -11,15 +11,16 @@
<div class="el_top_left">
<el-form-item label="配送日期">
<el-date-picker
v-model="TopQuery.time"
type="datetimerange"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="YYYY-MM-DD"
date-format="YYYY/MM/DD"
time-format="A"
@change="Toptiem"
/>
v-model="TopQuery.time"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:default-time="defaultTime2"
@change="Toptiem"
/>
</el-form-item>
<el-form-item label="仓库">
@ -196,6 +197,7 @@ const details = reactive({
search: false,
/** 表格搜索条件 */
query: {},
defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
/** 时间快捷选择设置 */
shortcuts: [
{
@ -283,6 +285,7 @@ const {
zeroAdditionalRecordingInfo,
popUpShow,
recorddata,
defaultTime2,
} = toRefs(details);
/** 展开列表控件 */

42
src/views/reportforms/DeliveryDetails.vue
Unescape View File

@ -11,17 +11,28 @@
<div class="el_top_left">
<el-form-item label="配送日期">
<el-date-picker
v-model="TopQuery.time"
type="datetimerange"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="YYYY-MM-DD"
date-format="YYYY/MM/DD"
time-format="A"
@change="Toptiem"
/>
v-model="TopQuery.time"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:default-time="defaultTime2"
/>
</el-form-item>
<el-form-item label="扫描签收时间">
<el-date-picker
v-model="TopQuery.Signfor"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:default-time="defaultTime2"
/>
</el-form-item>
<el-form-item label="仓库">
<el-select
multiple
@ -216,6 +227,7 @@ const details = reactive({
search: false,
/** 表格搜索条件 */
query: {},
defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
/** 时间快捷选择设置 */
shortcuts: [
{
@ -303,6 +315,7 @@ const {
zeroAdditionalRecordingInfo,
popUpShow,
recorddata,
defaultTime2,
} = toRefs(details);
/** 展开列表控件 */
@ -368,6 +381,15 @@ const searchChange = () => {
delete queryCarn.value.startTaskTime;
delete queryCarn.value.endTaskTime;
}
// 签收扫描时间
if (TopQuery.value.Signfor?.length) {
queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
} else {
delete queryCarn.value.startTaskTime;
delete queryCarn.value.endTaskTime;
}
// 仓库处理
if (TopQuery.value.warehouseNameRange?.length) {
queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');

23
src/views/reportforms/DeliveryTrainNumber.vue
Unescape View File

@ -10,16 +10,17 @@
<div class="el_top_left">
<el-form-item label="配送日期">
<el-date-picker
v-model="TopQuery.time"
type="datetimerange"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="YYYY-MM-DD"
date-format="YYYY/MM/DD"
time-format="A"
@change="Toptiem"
/>
<el-date-picker
v-model="TopQuery.time"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:default-time="defaultTime2"
@change="Toptiem"
/>
</el-form-item>
<el-form-item label="仓库">
@ -206,6 +207,7 @@ const details = reactive({
/** 表格搜索条件 */
query: {},
/** 时间快捷选择设置 */
defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
shortcuts: [
{
text: '最近一周',
@ -292,6 +294,7 @@ const {
zeroAdditionalRecordingInfo,
popUpShow,
recorddata,
defaultTime2,
} = toRefs(details);
/** 展开列表控件 */

20
src/views/reportforms/InventoryOutbound.vue
Unescape View File

@ -11,15 +11,15 @@
<div class="el_top_left">
<el-form-item label="出库时间">
<el-date-picker
v-model="TopQuery.time"
type="datetimerange"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="YYYY-MM-DD"
date-format="YYYY/MM/DD"
time-format="A"
@change="Toptiem"
/>
v-model="TopQuery.time"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:default-time="defaultTime2"
/>
</el-form-item>
<el-form-item label="仓库">
<el-select
@ -207,6 +207,7 @@ const details = reactive({
search: false,
/** 表格搜索条件 */
query: {},
defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
/** 时间快捷选择设置 */
shortcuts: [
{
@ -294,6 +295,7 @@ const {
zeroAdditionalRecordingInfo,
popUpShow,
recorddata,
defaultTime2,
} = toRefs(details);
/** 展开列表控件 */

20
src/views/reportforms/InventoryReceipt.vue
Unescape View File

@ -11,15 +11,15 @@
<div class="el_top_left">
<el-form-item label="入库时间">
<el-date-picker
v-model="TopQuery.time"
type="datetimerange"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="YYYY-MM-DD"
date-format="YYYY/MM/DD"
time-format="A"
@change="Toptiem"
/>
v-model="TopQuery.time"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:default-time="defaultTime2"
/>
</el-form-item>
<el-form-item label="仓库">
@ -208,6 +208,7 @@ const details = reactive({
search: false,
/** 表格搜索条件 */
query: {},
defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
/** 时间快捷选择设置 */
shortcuts: [
{
@ -295,6 +296,7 @@ const {
zeroAdditionalRecordingInfo,
popUpShow,
recorddata,
defaultTime2,
} = toRefs(details);
/** 展开列表控件 */

19
src/views/reportforms/Selfpickupreport.vue
Unescape View File

@ -12,14 +12,15 @@
<div class="el_top_left">
<el-form-item label="提货扫描时间">
<el-date-picker
v-model="TopQuery.time"
type="datetimerange"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="YYYY-MM-DD"
date-format="YYYY/MM/DD"
time-format="A"
/>
v-model="TopQuery.time"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:default-time="defaultTime2"
/>
</el-form-item>
<el-form-item label="仓库">
@ -171,6 +172,7 @@ const details = reactive({
search: false,
/** 表格搜索条件 */
query: {},
defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
/** 时间快捷选择设置 */
shortcuts: [
{
@ -258,6 +260,7 @@ const {
zeroAdditionalRecordingInfo,
popUpShow,
recorddata,
defaultTime2,
} = toRefs(details);
/** 展开列表控件 */

20
src/views/reportforms/Selfpickuptask.vue
Unescape View File

@ -11,15 +11,15 @@
<div class="el_top_left">
<el-form-item label="提货时间">
<el-date-picker
v-model="TopQuery.time"
type="datetimerange"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="YYYY-MM-DD"
date-format="YYYY/MM/DD"
time-format="A"
@change="Toptiem"
/>
v-model="TopQuery.time"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:default-time="defaultTime2"
/>
</el-form-item>
<el-form-item label="仓库">
@ -207,6 +207,7 @@ const details = reactive({
search: false,
/** 表格搜索条件 */
query: {},
defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
/** 时间快捷选择设置 */
shortcuts: [
{
@ -294,6 +295,7 @@ const {
zeroAdditionalRecordingInfo,
popUpShow,
recorddata,
defaultTime2,
} = toRefs(details);
/** 展开列表控件 */

20
src/views/reportforms/Stockordertable.vue
Unescape View File

@ -11,15 +11,15 @@
<div class="el_top_left">
<el-form-item label="入库时间">
<el-date-picker
v-model="TopQuery.time"
type="datetimerange"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="YYYY-MM-DD"
date-format="YYYY/MM/DD"
time-format="A"
@change="Toptiem"
/>
v-model="TopQuery.time"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
:default-time="defaultTime2"
/>
</el-form-item>
<el-form-item label="仓库">
@ -192,6 +192,7 @@ const details = reactive({
search: false,
/** 表格搜索条件 */
query: {},
defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
/** 时间快捷选择设置 */
shortcuts: [
{
@ -279,6 +280,7 @@ const {
zeroAdditionalRecordingInfo,
popUpShow,
recorddata,
defaultTime2,
} = toRefs(details);
/** 展开列表控件 */

42
src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue
Unescape View File

@ -249,6 +249,7 @@ const currentChange = val => {
// 刷新按钮
const searchChangeS = () => {
details.search = false; //关闭搜索
onLoad();
};
// 顶部搜索
const searchHide = () => {
@ -276,26 +277,35 @@ const onLoad = () => {
size: details.page.pageSize,
...details.query,
};
details.loadingObj.list = true;
$_warehouseRetentionRecordPage(data).then(res => {
console.log(res, '返回值');
details.data = res.data.data.records;
details.data.forEach(item => {
if (item.retentionWay == 1) {
item.retentionWayNameS = '扫描';
} else if (item.retentionWay == 2) {
item.retentionWayNameS = '文员';
}
if (item.scanType == 1) {
item.scanType = '包件';
} else if (item.scanTypeS == 2) {
item.scanTypeName = '订单';
} else if (item.scanType == 3) {
item.scanTypeNameS = '托盘';
if (res.data.code == 200) {
details.data = res.data.data.records || [];
if (details.data?.length) {
details.data.forEach(item => {
if (item.retentionWay == 1) {
item.retentionWayNameS = '扫描';
} else if (item.retentionWay == 2) {
item.retentionWayNameS = '文员';
}
if (item.scanType == 1) {
item.scanType = '包件';
} else if (item.scanTypeS == 2) {
item.scanTypeName = '订单';
} else if (item.scanType == 3) {
item.scanTypeNameS = '托盘';
}
});
}
});
details.page.total = res.data.data.total;
details.page.total = res.data.data.total||0;
}
}).catch(()=>{
}).finally(()=>{
details.loadingObj.list = false;
});
})
};
onLoad();
const view = row => {

Write Preview
Loading…
Cancel
Save