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

fix_bug_pro20231227
13208366016 1 year ago
parent
becd6ea3ee 2958d17616
commit
177ddf18c9
6 changed files with 282 additions and 272 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. 17
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  2. 17
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  3. 5
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue
  4. 8
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  5. 487
      src/views/distribution/reservation/reservation.vue
  6. 20
      src/views/distribution/reservation/reservationDetails.vue

17
src/views/distribution/deliverylist/distributionDeliveryList.vue
Unescape View File

@ -164,12 +164,8 @@
>批量打印</el-button
> -->
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
<el-button
type="danger"
icon="el-icon-download"
@click="handleExportInfo"
plain
>导出
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
>导出
</el-button>
</div>
<!-- 头部右侧按钮模块 -->
@ -335,7 +331,8 @@ import {
remove,
getPage,
getstatistics,
printBatch, getDeliveryListExport
printBatch,
getDeliveryListExport,
} from '@/api/distribution/distributionDeliveryList';
import option from '@/option/distribution/distributionDeliveryList';
import { mapGetters } from 'vuex';
@ -714,19 +711,21 @@ export default {
/**
* 导出
* */
handleExportInfo(){
handleExportInfo() {
let row = {};
// if (!!this.ids) {
// row.ids = this.ids;
// }
const ids = this.selectionList.join(',');
row.ids = ids;
row = { ...row, ...this.query };
delete row.deliveryStatusName;
delete row.kindName;
// console.log("<><><>>",ids);
getDeliveryListExport(row).then(res => {
// console.log(res.data);
downloadXls(res.data, '全部配送计划数据.xlsx');
});
},
getvehicleData() {
return new Promise((rv, rev) => {

17
src/views/distribution/deliverylist/distributionDeliveryListdis.vue
Unescape View File

@ -107,12 +107,8 @@
<el-button type="primary" @click="toDeliveryPlan">新增商配</el-button>
<el-button type="primary" @click="printBatchOrder">批量打印</el-button>
<el-button
type="danger"
icon="el-icon-download"
@click="handleExportInfo"
plain
>导出
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
>导出
</el-button>
</div>
<!-- 头部右侧按钮模块 -->
@ -325,7 +321,8 @@ import {
remove,
getPage,
getstatistics,
printBatch, getDeliveryListExport
printBatch,
getDeliveryListExport,
} from '@/api/distribution/distributionDeliveryList';
import option from '@/option/distribution/distributionDeliveryList';
import { mapGetters } from 'vuex';
@ -730,16 +727,18 @@ export default {
/**
* 导出
* */
handleExportInfo(){
handleExportInfo() {
let row = {};
const ids = this.selectionList.join(',');
row.ids = ids;
row.type = '1';
row = { ...row, ...this.query };
delete row.deliveryStatusName;
delete row.kindName;
getDeliveryListExport(row).then(res => {
console.log(res.data);
downloadXls(res.data, '商配配送计划数据.xlsx');
});
},
getvehicleData() {
return new Promise((rv, rev) => {

5
src/views/distribution/deliverylist/distributionDeliveryListmar.vue
Unescape View File

@ -708,6 +708,9 @@ export default {
const ids = this.selectionList.join(',');
row.ids = ids;
row.type = '2';
row = { ...row, ...this.query };
delete row.deliveryStatusName;
delete row.kindName;
getDeliveryListExport(row).then(res => {
console.log(res.data);
downloadXls(res.data, '市配配送计划数据.xlsx');
@ -892,6 +895,8 @@ export default {
console.log(index, row);
},
selectsc(index, row) {
console.log('index :>> ', index);
console.log('row :>> ', row);
this.query[row.prop] = index;
if (!index) {
delete this.query[row.prop];

8
src/views/distribution/inventory/distrilbutionBillLadingList.vue
Unescape View File

@ -791,8 +791,14 @@ export default {
console.log(index, row);
},
selectsc(index, row) {
console.log(index, row);
console.log('index :>> ', index);
console.log('row :>> ', row);
this.query[row.prop] = index;
if (!index) delete this.query[row.prop];
if (row.prop === 'certificateTypeName') {
this.query['certificateType'] = index;
if (!index) delete this.query['certificateType'];
}
this.onLoad(this.page);
},
timesc(index, row) {

487
src/views/distribution/reservation/reservation.vue
Unescape View File

@ -26,7 +26,7 @@
<!-- </el-form-item>-->
<!-- 查询按钮 -->
</div>
<el-form-item class='fo-btn'>
<el-form-item class="fo-btn">
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item>
@ -45,7 +45,7 @@
>添加预约
</el-button>
<el-button
v-if="this.query.reservationStatus === '1'"
v-if="this.queryA.reservationStatus === '1'"
type="danger"
icon="el-icon-delete"
@click="handleConfirmReservations"
@ -53,7 +53,7 @@
>批量确认
</el-button>
<el-button
v-if="this.query.reservationStatus === '2'"
v-if="this.queryA.reservationStatus === '2'"
type="danger"
icon="el-icon-delete"
@click="handleStockUp()"
@ -61,18 +61,14 @@
>批量转备货
</el-button>
<el-button
v-if="this.query.reservationStatus === '2'"
v-if="this.queryA.reservationStatus === '2'"
type="danger"
icon="el-icon-delete"
@click="handleDeliverys"
plain
>批量转配送
</el-button>
<el-button
type="danger"
icon="el-icon-delete"
@click="handleExportInfo"
plain
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo(1)" plain
>导出
</el-button>
</div>
@ -85,93 +81,52 @@
</div>
</el-row>
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="viewReservation(slotProps.scope)"
>查看
</el-text>
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="editsolt(slotProps.scope)"
>编辑
</el-text>
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="cancelReservation(slotProps.scope)"
>取消预约
</el-text>
<el-text
v-if="this.query.reservationStatus === '1' ? true : false"
size="small"
@click="confirmReservation(slotProps.scope)"
>确认预约
</el-text>
</template>
</tablecmt>
<!-- <el-popover :visible="visible" placement="top-start" :width="160">-->
<!-- <p>Are you sure to delete this?</p>-->
<!-- <el-input v-model= 'this.message'-->
<!-- type="textarea"-->
<!-- :rows="1"-->
<!-- placeholder="请输入取消原因"></el-input>-->
<!-- <div style="text-align: right; margin: 10%">-->
<!-- <el-button size="small" text @click="this.message='',visible = false">取消</el-button>-->
<!-- <el-button size="small" type="primary" @click="confirmReservation(slotProps.scope)"-->
<!-- >确认</el-button-->
<!-- >-->
<!-- </div>-->
<!--&lt;!&ndash; <template #reference>&ndash;&gt;-->
<!--&lt;!&ndash; </template>&ndash;&gt;-->
<!-- </el-popover>-->
<!-- <el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border">
<el-table-column type="selection" v-if="option.selection" width="55"
align="center"></el-table-column>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="序号" type="index" width="80px"
align="center"></el-table-column>
<template v-for="(item,index) in option.column">
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</el-table-column>
</template>
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
</template>
</el-table-column>
</el-table> -->
<template v-if="this.activename === 'nocheck'">
<!-- 列表模块 -->
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputscA"
@timeCheck="timescA"
@btnCheck="btnsc"
@selectCheck="selectscA"
@selection="selectionChange"
>
<template #default="slotProps">
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="viewReservation(slotProps.scope)"
>查看
</el-text>
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="editsolt(slotProps.scope)"
>编辑
</el-text>
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="cancelReservation(slotProps.scope)"
>取消预约
</el-text>
<el-text
v-if="this.queryA.reservationStatus === '1' ? true : false"
size="small"
@click="confirmReservation(slotProps.scope)"
>确认预约
</el-text>
</template>
</tablecmt>
</template>
</el-row>
</el-tab-pane>
<el-tab-pane label="已确认" name="yescheck">
@ -186,7 +141,7 @@
>添加预约
</el-button>
<el-button
v-if="this.query.reservationStatus === '1'"
v-if="this.queryB.reservationStatus === '1'"
type="danger"
icon="el-icon-delete"
@click="handleConfirmReservations"
@ -194,7 +149,7 @@
>批量确认
</el-button>
<el-button
v-if="this.query.reservationStatus === '2'"
v-if="this.queryB.reservationStatus === '2'"
type="danger"
icon="el-icon-delete"
@click="handleStockUp()"
@ -202,7 +157,7 @@
>批量转备货
</el-button>
<el-button
v-if="this.query.reservationStatus === '2'"
v-if="this.queryB.reservationStatus === '2'"
type="danger"
icon="el-icon-delete"
@click="handleDeliverys"
@ -210,20 +165,15 @@
>批量转配送
</el-button>
<el-button
v-if="this.query.reservationStatus === '2'"
v-if="this.queryB.reservationStatus === '2'"
type="danger"
icon="el-icon-delete"
@click="batchPrintData"
plain
>批量打印
</el-button>
<el-button
type="danger"
icon="el-icon-delete"
@click="handleExportInfo"
plain
>导出
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo(2)" plain
>导出
</el-button>
</div>
<!-- 头部右侧按钮模块 -->
@ -235,58 +185,60 @@
</div>
</el-row>
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="viewReservation(slotProps.scope)"
>查看
</el-text>
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="editsolt(slotProps.scope)"
>编辑
</el-text>
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="cancelReservation(slotProps.scope)"
>取消预约
</el-text>
<el-text
v-if="this.query.reservationStatus === '1' ? true : false"
size="small"
@click="confirmReservation(slotProps.scope)"
>确认预约
</el-text>
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="printData(slotProps.scope)"
>打印
</el-text>
</template>
</tablecmt>
<template v-if="this.activename === 'yescheck'">
<!-- 列表模块 -->
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputscB"
@timeCheck="timescB"
@btnCheck="btnsc"
@selectCheck="selectscB"
@selection="selectionChange"
>
<template #default="slotProps">
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="viewReservation(slotProps.scope)"
>查看
</el-text>
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="editsolt(slotProps.scope)"
>编辑
</el-text>
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="cancelReservation(slotProps.scope)"
>取消预约
</el-text>
<el-text
v-if="this.queryB.reservationStatus === '1' ? true : false"
size="small"
@click="confirmReservation(slotProps.scope)"
>确认预约
</el-text>
<el-text
size="small"
type="primary"
link
icon="el-icon-view"
@click="printData(slotProps.scope)"
>打印
</el-text>
</template>
</tablecmt>
</template>
<!-- <el-popover :visible="visible" placement="top-start" :width="160">-->
<!-- <p>Are you sure to delete this?</p>-->
<!-- <el-input v-model= 'this.message'-->
@ -431,7 +383,8 @@ import {
confirms,
addReservations,
cancelReservation,
patchPrintList, reservationExport
patchPrintList,
reservationExport,
} from '@/api/distribution/distributionReservation';
import option from '@/option/distribution/distributionReservation';
import { mapGetters } from 'vuex';
@ -905,7 +858,8 @@ export default {
// 是否为查看模式
view: false,
// 查询信息
query: {},
queryA: {},
queryB: {},
// 分页信息
page: {
currentPage: 1,
@ -940,6 +894,7 @@ export default {
deptId: '',
cancelReservationRow: {},
activeName: 'nocheck',
activename: 'nocheck',
};
},
watch: {
@ -1044,24 +999,27 @@ export default {
/**
* 导出
* */
handleExportInfo(type){
handleExportInfo(type) {
let row = {};
if (!!this.ids) {
row.ids = this.ids;
}
let nulName ;
if(type === 1){
//未
let nulName;
if (type === 1) {
// 未
nulName = '待确定预约单数据.xlsx';
}else{
//已
row = { ...row, ...this.queryA };
row.reservationStatus = '1';
} else {
// 已
nulName = '已确定预约单数据.xlsx';
row = { ...row, ...this.queryB };
row.reservationStatus = '2';
}
reservationExport(row).then(res => {
console.log(res.data);
downloadXls(res.data, nulName);
});
},
showdrawer(value) {
this.drawerShow = value;
@ -1120,54 +1078,85 @@ export default {
btnsc(index, row) {
console.log(index, row);
},
selectsc(index, row) {
selectscA(index, row) {
console.log(index, row);
if (row.prop === 'periodOfTimeName') {
this.query['periodOfTime'] = index;
this.queryA['periodOfTime'] = index;
} else if (row.prop === 'stockupStatusName') {
this.query['stockupStatus'] = index;
this.queryA['stockupStatus'] = index;
} else if (row.prop === 'serveTypeName') {
this.query['serveType'] = index;
console.log(this.query, '----------->');
this.queryA['serveType'] = index;
console.log(this.queryA, '----------->');
} else {
this.query[row.prop] = index;
this.queryA[row.prop] = index;
}
this.onLoad(this.page);
},
selectscB(index, row) {
console.log(index, row);
if (row.prop === 'periodOfTimeName') {
this.queryB['periodOfTime'] = index;
} else if (row.prop === 'stockupStatusName') {
this.queryB['stockupStatus'] = index;
} else if (row.prop === 'serveTypeName') {
this.queryB['serveType'] = index;
console.log(this.queryB, '----------->');
} else {
this.queryB[row.prop] = index;
}
this.onLoad(this.page);
},
timescA(index, row) {
console.log(index, row);
console.log(index, row);
if (!!index) {
index = dayjs(index).format('YYYY-MM-DD');
}
this.queryA[row.prop] = index;
if (!index) {
delete this.queryA[row.prop];
}
this.onLoad(this.page);
},
timesc(index, row) {
timescB(index, row) {
console.log(index, row);
console.log(index, row);
if (!!index) {
index = dayjs(index).format('YYYY-MM-DD');
}
this.query[row.prop] = index;
this.queryB[row.prop] = index;
if (!index) {
delete this.query[row.prop];
delete this.queryB[row.prop];
}
this.onLoad(this.page);
},
inputsc(index, row) {
inputscA(index, row) {
console.log(index, row);
this.query[row.prop] = index;
this.queryA[row.prop] = index;
if (!index) delete this.queryA[row.prop];
this.onLoad(this.page);
},
inputscB(index, row) {
console.log(index, row);
this.queryB[row.prop] = index;
if (!index) delete this.queryB[row.prop];
this.onLoad(this.page);
},
init() {
this.height = this.setPx(document.body.clientHeight - 340);
},
handleClick() {
handleClick(e) {
console.log('e :>> ', e.props.name);
// 切换选项卡时, 清空备选中的数组
this.selectionList = [];
if (this.activeName == 'yescheck') {
this.activeName = 'nocheck';
} else if (this.activeName == 'nocheck') {
this.activeName = 'yescheck';
}
if (this.activeName == 'yescheck') {
this.bbb();
} else if (this.activeName == 'nocheck') {
this.aaa();
}
this.activename = e.props.name;
this.onLoad(this.page);
// if (e.props.name === 'yescheck') {
// this.bbb();
// } else {
// this.aaa();
// }
// console.log('this.activename :>> ', this.activename);
},
cancelReservationConfirm() {
if (!this.cancel.message) {
@ -1267,7 +1256,7 @@ export default {
getListTeam(
this.page.currentPage,
this.page.pageSize,
Object.assign(params, this.query)
Object.assign(params, this.queryB)
).then(res => {
// console.log(">><><",res.data.data.records);
let fo = [];
@ -1306,7 +1295,8 @@ export default {
this.onLoad(this.page);
},
searchReset() {
this.query = {};
this.queryA = {};
this.queryB = {};
this.page.currentPage = 1;
this.onLoad(this.page);
},
@ -1365,11 +1355,11 @@ export default {
});
},
aaa() {
this.query.reservationStatus = '1';
this.queryA.reservationStatus = '1';
this.onLoad(this.page);
},
bbb() {
this.query.reservationStatus = '2';
this.queryB.reservationStatus = '2';
this.onLoad(this.page);
},
handleView(row) {
@ -1517,60 +1507,71 @@ export default {
onLoad(page, params = {}) {
this.loading = true;
if (!this.query.reservationStatus) {
this.query.reservationStatus = '1';
// if (!this.query.reservationStatus) {
// this.query.reservationStatus = '1';
// }
let query = this.queryB;
query.reservationStatus = '2';
console.log('this.activename :>> ', this.activename);
if (this.activename === 'nocheck') {
console.log('123123 :>> ', 123123);
query = this.queryA;
query.reservationStatus = this.queryA.reservationStatus || '1';
}
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// if (this.queryA.reservationStatus)
getList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
const data = res.data.data;
console.log('>>>>>>>', data);
data.records.forEach(item => {
this.orderSourceData.forEach(a => {
if (item.orderSource === a.dictKey) {
item.orderSource = a.dictValue;
}
});
// this.stockupStatusData.forEach(b => {
// if (item.stockupStatus === b.dictKey) {
// item.stockupStatus = b.dictValue;
// }
// });
this.resvervationStatusData.forEach(e => {
if (item.reservationStatus === e.dictKey) {
item.reservationStatus = e.dictValue;
}
});
this.deliveryTypeData.forEach(c => {
if (item.deliveryType === c.dictKey) {
item.deliveryType = c.dictValue;
}
});
if (data.records) {
data.records.forEach(item => {
this.orderSourceData.forEach(a => {
if (item.orderSource === a.dictKey) {
item.orderSource = a.dictValue;
}
});
// this.stockupStatusData.forEach(b => {
// if (item.stockupStatus === b.dictKey) {
// item.stockupStatus = b.dictValue;
// }
// });
this.resvervationStatusData.forEach(e => {
if (item.reservationStatus === e.dictKey) {
item.reservationStatus = e.dictValue;
}
});
this.deliveryTypeData.forEach(c => {
if (item.deliveryType === c.dictKey) {
item.deliveryType = c.dictValue;
}
});
this.deliveryWayData.forEach(c => {
if (item.deliveryWay === c.dictKey) {
item.deliveryWay = c.dictValue;
}
});
this.periodOfTimeData.forEach(d => {
console.log('11111111111');
if (item.periodOfTime === d.dictKey) {
item.periodOfTime = d.dictValue;
}
});
let pa = [];
if (item.serveType.length > 1) {
pa = item.serveType.split(',');
} else {
pa.push(item.serveType);
}
this.addvalueServeTypeData.forEach(f => {
pa.forEach((p, index) => {
if (p === f.dictKey) {
pa[index] = f.dictValue;
this.deliveryWayData.forEach(c => {
if (item.deliveryWay === c.dictKey) {
item.deliveryWay = c.dictValue;
}
});
this.periodOfTimeData.forEach(d => {
console.log('11111111111');
if (item.periodOfTime === d.dictKey) {
item.periodOfTime = d.dictValue;
}
});
let pa = [];
if (item.serveType.length > 1) {
pa = item.serveType.split(',');
} else {
pa.push(item.serveType);
}
this.addvalueServeTypeData.forEach(f => {
pa.forEach((p, index) => {
if (p === f.dictKey) {
pa[index] = f.dictValue;
}
});
});
item.serveType = pa.join(',');
});
item.serveType = pa.join(',');
});
}
this.page.total = data.total;
this.data = data.records;
this.loading = false;
@ -1667,7 +1668,7 @@ export default {
.fo-btn {
margin-right: 0;
}
:deep(.el-form-item__label){
:deep(.el-form-item__label) {
padding: 0;
}
</style>

20
src/views/distribution/reservation/reservationDetails.vue
Unescape View File

@ -662,16 +662,16 @@
fixed: false,
sortable: true
},
{
label: '服务类型',
prop: 'typeService',
type: 2,
values: '',
width: '160',
checkarr: [],
fixed: false,
sortable: true
},
// {
// label: '服务类型',
// prop: 'typeService',
// type: 1,
// values: '',
// width: '160',
// checkarr: [],
// fixed: false,
// sortable: true
// },
{
label: '包件数量',
prop: 'reservationNum',

Write Preview
Loading…
Cancel
Save