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

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

dev-xx
qb 9 months ago
parent
2615f1adfc 1a0430ac45
commit
c912b7f6e4
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
Unified 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', prop: 'trainNumber',
label: '车次号', label: '车次号',
type: 1, type:2,
values: '', values: '',
width: '180', width: '180',
checkarr: [], checkarr: [],
@ -34,7 +34,7 @@ export const columnList = [
{ {
prop: 'reservationCode', prop: 'reservationCode',
label: '预约编号', label: '预约编号',
type: 1, type: 2,
values: '', values: '',
width: '180', width: '180',
checkarr: [], checkarr: [],
@ -44,7 +44,7 @@ export const columnList = [
{ {
prop: 'waybillNumber', prop: 'waybillNumber',
label: '运单号', label: '运单号',
type: 1, type: 2,
values: '', values: '',
width: '180', width: '180',
checkarr: [], checkarr: [],
@ -66,7 +66,7 @@ export const columnList = [
{ {
prop: 'orderPackageCode', prop: 'orderPackageCode',
label: '包条码', label: '包条码',
type: 1, type:2,
values: '', values: '',
width: '180', width: '180',
checkarr: [], checkarr: [],
@ -101,7 +101,7 @@ export const columnList = [
{ {
prop: 'retentionScanTime', prop: 'retentionScanTime',
label: '滞留扫描时间', label: '滞留扫描时间',
type: 1, type: 4,
values: '', values: '',
width: '180', width: '180',
checkarr: [], checkarr: [],
@ -111,7 +111,7 @@ export const columnList = [
{ {
prop: 'retentionScanUsername', prop: 'retentionScanUsername',
label: '滞留操作人', label: '滞留操作人',
type: 1, type: 2,
values: '', values: '',
width: '180', width: '180',
checkarr: [], checkarr: [],
@ -132,7 +132,7 @@ export const columnList = [
{ {
prop: 'warehouseName', prop: 'warehouseName',
label: '仓库名称', label: '仓库名称',
type: 1, type:2,
values: '', values: '',
width: '180', width: '180',
checkarr: [], checkarr: [],

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

@ -11,15 +11,16 @@
<div class="el_top_left"> <div class="el_top_left">
<el-form-item label="配送日期"> <el-form-item label="配送日期">
<el-date-picker <el-date-picker
v-model="TopQuery.time" v-model="TopQuery.time"
type="datetimerange" type="datetimerange"
start-placeholder="开始日期" unlink-panels
end-placeholder="结束日期" range-separator="至"
format="YYYY-MM-DD" start-placeholder="开始时间"
date-format="YYYY/MM/DD" end-placeholder="结束时间"
time-format="A" :shortcuts="shortcuts"
@change="Toptiem" :default-time="defaultTime2"
/> @change="Toptiem"
/>
</el-form-item> </el-form-item>
<el-form-item label="仓库"> <el-form-item label="仓库">
@ -196,6 +197,7 @@ const details = reactive({
search: false, search: false,
/** 表格搜索条件 */ /** 表格搜索条件 */
query: {}, 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: [ shortcuts: [
{ {
@ -283,6 +285,7 @@ const {
zeroAdditionalRecordingInfo, zeroAdditionalRecordingInfo,
popUpShow, popUpShow,
recorddata, recorddata,
defaultTime2,
} = toRefs(details); } = toRefs(details);
/** 展开列表控件 */ /** 展开列表控件 */

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

@ -11,17 +11,28 @@
<div class="el_top_left"> <div class="el_top_left">
<el-form-item label="配送日期"> <el-form-item label="配送日期">
<el-date-picker <el-date-picker
v-model="TopQuery.time" v-model="TopQuery.time"
type="datetimerange" type="datetimerange"
start-placeholder="开始日期" unlink-panels
end-placeholder="结束日期" range-separator="至"
format="YYYY-MM-DD" start-placeholder="开始时间"
date-format="YYYY/MM/DD" end-placeholder="结束时间"
time-format="A" :shortcuts="shortcuts"
@change="Toptiem" :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>
<el-form-item label="仓库"> <el-form-item label="仓库">
<el-select <el-select
multiple multiple
@ -216,6 +227,7 @@ const details = reactive({
search: false, search: false,
/** 表格搜索条件 */ /** 表格搜索条件 */
query: {}, 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: [ shortcuts: [
{ {
@ -303,6 +315,7 @@ const {
zeroAdditionalRecordingInfo, zeroAdditionalRecordingInfo,
popUpShow, popUpShow,
recorddata, recorddata,
defaultTime2,
} = toRefs(details); } = toRefs(details);
/** 展开列表控件 */ /** 展开列表控件 */
@ -368,6 +381,15 @@ const searchChange = () => {
delete queryCarn.value.startTaskTime; delete queryCarn.value.startTaskTime;
delete queryCarn.value.endTaskTime; 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) { if (TopQuery.value.warehouseNameRange?.length) {
queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(','); 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"> <div class="el_top_left">
<el-form-item label="配送日期"> <el-form-item label="配送日期">
<el-date-picker <el-date-picker
v-model="TopQuery.time" v-model="TopQuery.time"
type="datetimerange" type="datetimerange"
start-placeholder="开始日期" unlink-panels
end-placeholder="结束日期" range-separator="至"
format="YYYY-MM-DD" start-placeholder="开始时间"
date-format="YYYY/MM/DD" end-placeholder="结束时间"
time-format="A" :shortcuts="shortcuts"
@change="Toptiem" :default-time="defaultTime2"
/> @change="Toptiem"
/>
</el-form-item> </el-form-item>
<el-form-item label="仓库"> <el-form-item label="仓库">
@ -206,6 +207,7 @@ const details = reactive({
/** 表格搜索条件 */ /** 表格搜索条件 */
query: {}, 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: [ shortcuts: [
{ {
text: '最近一周', text: '最近一周',
@ -292,6 +294,7 @@ const {
zeroAdditionalRecordingInfo, zeroAdditionalRecordingInfo,
popUpShow, popUpShow,
recorddata, recorddata,
defaultTime2,
} = toRefs(details); } = toRefs(details);
/** 展开列表控件 */ /** 展开列表控件 */

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

@ -11,15 +11,15 @@
<div class="el_top_left"> <div class="el_top_left">
<el-form-item label="出库时间"> <el-form-item label="出库时间">
<el-date-picker <el-date-picker
v-model="TopQuery.time" v-model="TopQuery.time"
type="datetimerange" type="datetimerange"
start-placeholder="开始日期" unlink-panels
end-placeholder="结束日期" range-separator="至"
format="YYYY-MM-DD" start-placeholder="开始时间"
date-format="YYYY/MM/DD" end-placeholder="结束时间"
time-format="A" :shortcuts="shortcuts"
@change="Toptiem" :default-time="defaultTime2"
/> />
</el-form-item> </el-form-item>
<el-form-item label="仓库"> <el-form-item label="仓库">
<el-select <el-select
@ -207,6 +207,7 @@ const details = reactive({
search: false, search: false,
/** 表格搜索条件 */ /** 表格搜索条件 */
query: {}, 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: [ shortcuts: [
{ {
@ -294,6 +295,7 @@ const {
zeroAdditionalRecordingInfo, zeroAdditionalRecordingInfo,
popUpShow, popUpShow,
recorddata, recorddata,
defaultTime2,
} = toRefs(details); } = toRefs(details);
/** 展开列表控件 */ /** 展开列表控件 */

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

@ -11,15 +11,15 @@
<div class="el_top_left"> <div class="el_top_left">
<el-form-item label="入库时间"> <el-form-item label="入库时间">
<el-date-picker <el-date-picker
v-model="TopQuery.time" v-model="TopQuery.time"
type="datetimerange" type="datetimerange"
start-placeholder="开始日期" unlink-panels
end-placeholder="结束日期" range-separator="至"
format="YYYY-MM-DD" start-placeholder="开始时间"
date-format="YYYY/MM/DD" end-placeholder="结束时间"
time-format="A" :shortcuts="shortcuts"
@change="Toptiem" :default-time="defaultTime2"
/> />
</el-form-item> </el-form-item>
<el-form-item label="仓库"> <el-form-item label="仓库">
@ -208,6 +208,7 @@ const details = reactive({
search: false, search: false,
/** 表格搜索条件 */ /** 表格搜索条件 */
query: {}, 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: [ shortcuts: [
{ {
@ -295,6 +296,7 @@ const {
zeroAdditionalRecordingInfo, zeroAdditionalRecordingInfo,
popUpShow, popUpShow,
recorddata, recorddata,
defaultTime2,
} = toRefs(details); } = toRefs(details);
/** 展开列表控件 */ /** 展开列表控件 */

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

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

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

@ -11,15 +11,15 @@
<div class="el_top_left"> <div class="el_top_left">
<el-form-item label="提货时间"> <el-form-item label="提货时间">
<el-date-picker <el-date-picker
v-model="TopQuery.time" v-model="TopQuery.time"
type="datetimerange" type="datetimerange"
start-placeholder="开始日期" unlink-panels
end-placeholder="结束日期" range-separator="至"
format="YYYY-MM-DD" start-placeholder="开始时间"
date-format="YYYY/MM/DD" end-placeholder="结束时间"
time-format="A" :shortcuts="shortcuts"
@change="Toptiem" :default-time="defaultTime2"
/> />
</el-form-item> </el-form-item>
<el-form-item label="仓库"> <el-form-item label="仓库">
@ -207,6 +207,7 @@ const details = reactive({
search: false, search: false,
/** 表格搜索条件 */ /** 表格搜索条件 */
query: {}, 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: [ shortcuts: [
{ {
@ -294,6 +295,7 @@ const {
zeroAdditionalRecordingInfo, zeroAdditionalRecordingInfo,
popUpShow, popUpShow,
recorddata, recorddata,
defaultTime2,
} = toRefs(details); } = toRefs(details);
/** 展开列表控件 */ /** 展开列表控件 */

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

@ -11,15 +11,15 @@
<div class="el_top_left"> <div class="el_top_left">
<el-form-item label="入库时间"> <el-form-item label="入库时间">
<el-date-picker <el-date-picker
v-model="TopQuery.time" v-model="TopQuery.time"
type="datetimerange" type="datetimerange"
start-placeholder="开始日期" unlink-panels
end-placeholder="结束日期" range-separator="至"
format="YYYY-MM-DD" start-placeholder="开始时间"
date-format="YYYY/MM/DD" end-placeholder="结束时间"
time-format="A" :shortcuts="shortcuts"
@change="Toptiem" :default-time="defaultTime2"
/> />
</el-form-item> </el-form-item>
<el-form-item label="仓库"> <el-form-item label="仓库">
@ -192,6 +192,7 @@ const details = reactive({
search: false, search: false,
/** 表格搜索条件 */ /** 表格搜索条件 */
query: {}, 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: [ shortcuts: [
{ {
@ -279,6 +280,7 @@ const {
zeroAdditionalRecordingInfo, zeroAdditionalRecordingInfo,
popUpShow, popUpShow,
recorddata, recorddata,
defaultTime2,
} = toRefs(details); } = toRefs(details);
/** 展开列表控件 */ /** 展开列表控件 */

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

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

Write Preview
Loading…
Cancel
Save