|
|
|
|
@ -45,65 +45,69 @@
|
|
|
|
|
|
|
|
|
|
<el-form-item label="配送时间:"> |
|
|
|
|
<el-date-picker |
|
|
|
|
v-model="query.taskTimeSection" |
|
|
|
|
type="datetimerange" |
|
|
|
|
align="right" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始日期" |
|
|
|
|
end-placeholder="结束日期" |
|
|
|
|
format="YYYY/MM/DD" |
|
|
|
|
value-format="YYYY-MM-DD" |
|
|
|
|
:picker-options="pickerOptions"> |
|
|
|
|
v-model="query.taskTimeSection" |
|
|
|
|
type="datetimerange" |
|
|
|
|
align="right" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始日期" |
|
|
|
|
end-placeholder="结束日期" |
|
|
|
|
format="YYYY/MM/DD" |
|
|
|
|
value-format="YYYY-MM-DD" |
|
|
|
|
:picker-options="pickerOptions" |
|
|
|
|
> |
|
|
|
|
</el-date-picker> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="装车时间:"> |
|
|
|
|
<el-date-picker |
|
|
|
|
v-model="query.loadingTimeSection" |
|
|
|
|
type="datetimerange" |
|
|
|
|
align="right" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始日期" |
|
|
|
|
end-placeholder="结束日期" |
|
|
|
|
format="YYYY/MM/DD" |
|
|
|
|
value-format="YYYY-MM-DD" |
|
|
|
|
:picker-options="pickerOptions"> |
|
|
|
|
v-model="query.loadingTimeSection" |
|
|
|
|
type="datetimerange" |
|
|
|
|
align="right" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始日期" |
|
|
|
|
end-placeholder="结束日期" |
|
|
|
|
format="YYYY/MM/DD" |
|
|
|
|
value-format="YYYY-MM-DD" |
|
|
|
|
:picker-options="pickerOptions" |
|
|
|
|
> |
|
|
|
|
</el-date-picker> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="司机签收时间:"> |
|
|
|
|
<el-date-picker |
|
|
|
|
v-model="query.sjsigningTimeSection" |
|
|
|
|
type="datetimerange" |
|
|
|
|
align="right" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始日期" |
|
|
|
|
end-placeholder="结束日期" |
|
|
|
|
format="YYYY/MM/DD" |
|
|
|
|
value-format="YYYY-MM-DD" |
|
|
|
|
:picker-options="pickerOptions"> |
|
|
|
|
v-model="query.sjsigningTimeSection" |
|
|
|
|
type="datetimerange" |
|
|
|
|
align="right" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始日期" |
|
|
|
|
end-placeholder="结束日期" |
|
|
|
|
format="YYYY/MM/DD" |
|
|
|
|
value-format="YYYY-MM-DD" |
|
|
|
|
:picker-options="pickerOptions" |
|
|
|
|
> |
|
|
|
|
</el-date-picker> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="文员审核时间:"> |
|
|
|
|
<el-date-picker |
|
|
|
|
v-model="query.signingTimeSection" |
|
|
|
|
type="datetimerange" |
|
|
|
|
align="right" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始日期" |
|
|
|
|
end-placeholder="结束日期" |
|
|
|
|
format="YYYY/MM/DD" |
|
|
|
|
value-format="YYYY-MM-DD" |
|
|
|
|
:picker-options="pickerOptions"> |
|
|
|
|
v-model="query.signingTimeSection" |
|
|
|
|
type="datetimerange" |
|
|
|
|
align="right" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始日期" |
|
|
|
|
end-placeholder="结束日期" |
|
|
|
|
format="YYYY/MM/DD" |
|
|
|
|
value-format="YYYY-MM-DD" |
|
|
|
|
:picker-options="pickerOptions" |
|
|
|
|
> |
|
|
|
|
</el-date-picker> |
|
|
|
|
</el-form-item> |
|
|
|
|
</div> |
|
|
|
|
<!-- 查询按钮 --> |
|
|
|
|
<el-form-item class="el-btn"> |
|
|
|
|
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button> |
|
|
|
|
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button> |
|
|
|
|
<el-button icon="el-icon-delete" @click="searchReset">清 空</el-button> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-form> |
|
|
|
|
</el-row> |
|
|
|
|
@ -115,9 +119,9 @@
|
|
|
|
|
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain |
|
|
|
|
>导出 |
|
|
|
|
</el-button> |
|
|
|
|
<!-- v-loading.fullscreen.lock="fullscreenLoading"--> |
|
|
|
|
<!-- v-loading.fullscreen.lock="fullscreenLoading"--> |
|
|
|
|
<el-button type="danger" icon="el-icon-picture" @click="handlePictureInfo" plain |
|
|
|
|
>导出图片 |
|
|
|
|
>导出图片 |
|
|
|
|
</el-button> |
|
|
|
|
</div> |
|
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
|
@ -145,7 +149,7 @@
|
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
</el-row> |
|
|
|
|
<el-row class='el-fy'> |
|
|
|
|
<el-row class="el-fy"> |
|
|
|
|
<div class="avue-crud__pagination flex-c-sb" style="width: 100%"> |
|
|
|
|
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div> |
|
|
|
|
<!-- 分页模块 --> |
|
|
|
|
@ -217,28 +221,18 @@
|
|
|
|
|
</template> |
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog |
|
|
|
|
title="提示" |
|
|
|
|
v-model="dialogVisible" |
|
|
|
|
width="15%" |
|
|
|
|
:before-close="handleClose"> |
|
|
|
|
<el-dialog title="提示" v-model="dialogVisible" width="15%" :before-close="handleClose"> |
|
|
|
|
<div align="center"> |
|
|
|
|
<el-progress type="circle" :percentage="fileSize" status="success"></el-progress> |
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
|
<el-button @click="dialogVisible = false">取 消</el-button> |
|
|
|
|
<el-button type="primary" @click="dialogVisible = false">确 定</el-button> |
|
|
|
|
</span> |
|
|
|
|
<el-button @click="dialogVisible = false">取 消</el-button> |
|
|
|
|
<el-button type="primary" @click="dialogVisible = false">确 定</el-button> |
|
|
|
|
</span> |
|
|
|
|
</el-dialog> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</basic-container> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<edittablehead |
|
|
|
|
@setcolum="setnewcolum" |
|
|
|
|
@closce="showdrawer" |
|
|
|
|
@ -264,7 +258,7 @@ import dayjs from 'dayjs';
|
|
|
|
|
|
|
|
|
|
import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; |
|
|
|
|
import { handlePicture } from '@/api/distribution/distributionSignfor'; |
|
|
|
|
import { downloadXls } from '@/utils/util'; |
|
|
|
|
import { downloadXls, handleClearTableQuery } from '@/utils/util'; |
|
|
|
|
export default { |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
@ -610,7 +604,7 @@ export default {
|
|
|
|
|
signingStatusData: [], |
|
|
|
|
//业务类型 |
|
|
|
|
deliveryTypeData: [], |
|
|
|
|
fullscreenLoading:false, |
|
|
|
|
fullscreenLoading: false, |
|
|
|
|
//来源 |
|
|
|
|
orderSourceData: [], |
|
|
|
|
// 分页信息 |
|
|
|
|
@ -628,7 +622,7 @@ export default {
|
|
|
|
|
// 表单列表 |
|
|
|
|
data: [], |
|
|
|
|
driverData: [], |
|
|
|
|
fileSize:0, |
|
|
|
|
fileSize: 0, |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
@ -744,59 +738,56 @@ export default {
|
|
|
|
|
// } |
|
|
|
|
// const h = this.$createElement; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
console.log("this.selectionList>>>>>>>>>>",this.selectionList); |
|
|
|
|
if (this.selectionList.length < 1){ |
|
|
|
|
console.log('this.selectionList>>>>>>>>>>', this.selectionList); |
|
|
|
|
if (this.selectionList.length < 1) { |
|
|
|
|
this.$message({ |
|
|
|
|
type: 'warning', |
|
|
|
|
message: '请选择签收记录!', |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
const idList= this.selectionList.map(item=>{ |
|
|
|
|
console.log('>>>>>>>>>',item); |
|
|
|
|
return{id:item.id,reservationCode:item.reservationCode,client:item.consignee} |
|
|
|
|
}) |
|
|
|
|
const idList = this.selectionList.map(item => { |
|
|
|
|
console.log('>>>>>>>>>', item); |
|
|
|
|
return { id: item.id, reservationCode: item.reservationCode, client: item.consignee }; |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
const _arr = []; |
|
|
|
|
console.log(idList); |
|
|
|
|
if (idList.length > 0){ |
|
|
|
|
console.log(idList); |
|
|
|
|
if (idList.length > 0) { |
|
|
|
|
// this.fullscreenLoading = true; |
|
|
|
|
// this.dialogVisible = true; |
|
|
|
|
|
|
|
|
|
idList.forEach(item=>{ |
|
|
|
|
return _arr.push(handlePicture(item.id)); |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
idList.forEach(item => { |
|
|
|
|
return _arr.push(handlePicture(item.id)); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
console.log('arr>>>>>>>>>>>>>>>>>>>>',_arr); |
|
|
|
|
console.log('arr>>>>>>>>>>>>>>>>>>>>', _arr); |
|
|
|
|
function delayedTimer() { |
|
|
|
|
console.log('Delayed timer executed!'); |
|
|
|
|
} |
|
|
|
|
const timerId = setTimeout(delayedTimer, 500); |
|
|
|
|
Promise.all(_arr).then((response)=>{ |
|
|
|
|
|
|
|
|
|
console.log('response>>>>>>>>>>>>>>>>>>>>>',response); |
|
|
|
|
response.forEach((res, index) =>{ |
|
|
|
|
console.log('res>>>>>>>>>>>>>>>>>>>>>',res.data); |
|
|
|
|
if (res.data.size > 0){ |
|
|
|
|
Promise.all(_arr).then(response => { |
|
|
|
|
console.log('response>>>>>>>>>>>>>>>>>>>>>', response); |
|
|
|
|
response.forEach((res, index) => { |
|
|
|
|
console.log('res>>>>>>>>>>>>>>>>>>>>>', res.data); |
|
|
|
|
if (res.data.size > 0) { |
|
|
|
|
const _item = idList[index]; |
|
|
|
|
const blob = new Blob([res.data], {type: 'application/zip'}); |
|
|
|
|
let a = document.createElement("a"); |
|
|
|
|
const blob = new Blob([res.data], { type: 'application/zip' }); |
|
|
|
|
let a = document.createElement('a'); |
|
|
|
|
a.href = window.URL.createObjectURL(blob); |
|
|
|
|
// a.href = 'http://192.168.10.25:2888/D:/Test'; |
|
|
|
|
a.download = _item.client +'-'+_item.reservationCode +".zip"; |
|
|
|
|
a.download = _item.client + '-' + _item.reservationCode + '.zip'; |
|
|
|
|
// a.download = 'aaa' + ".zip"; |
|
|
|
|
a.style.display = "none"; |
|
|
|
|
a.style.display = 'none'; |
|
|
|
|
document.body.appendChild(a); |
|
|
|
|
a.click(); // 模拟点击了a标签，会触发a标签的href的读取，浏览器就会自动下载了 |
|
|
|
|
a.remove(); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
for (let i = 0; i < 100; i++) { |
|
|
|
|
this.fileSize = i; |
|
|
|
|
} |
|
|
|
|
// this.dialogVisible = false; |
|
|
|
|
}); |
|
|
|
|
for (let i = 0; i < 100; i++) { |
|
|
|
|
this.fileSize = i; |
|
|
|
|
} |
|
|
|
|
// this.dialogVisible = false; |
|
|
|
|
setTimeout(() => { |
|
|
|
|
clearTimeout(timerId); |
|
|
|
|
console.log('延迟执行完成'); |
|
|
|
|
@ -804,18 +795,14 @@ export default {
|
|
|
|
|
|
|
|
|
|
this.$notify({ |
|
|
|
|
title: '提示', |
|
|
|
|
message: ('i', { style: 'color: teal'}, '开始下载...') |
|
|
|
|
message: ('i', { style: 'color: teal' }, '开始下载...'), |
|
|
|
|
}); |
|
|
|
|
}, 3000); |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
// 在 3 秒之后，自动清除定时器 |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// row.signingStatus = '2'; |
|
|
|
|
// row = { ...row, ...this.query }; |
|
|
|
|
// // console.log("<><><>>",ids); |
|
|
|
|
@ -961,6 +948,7 @@ export default {
|
|
|
|
|
searchReset() { |
|
|
|
|
this.query = {}; |
|
|
|
|
this.page.currentPage = 1; |
|
|
|
|
handleClearTableQuery(this.columnList); |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
handleSubmit() { |
|
|
|
|
@ -1066,35 +1054,37 @@ export default {
|
|
|
|
|
onLoad(page, params = {}) { |
|
|
|
|
this.loading = true; |
|
|
|
|
this.query.signingStatus = '2'; |
|
|
|
|
getClientPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
const data = res.data.data; |
|
|
|
|
// eslint-disable-next-line no-empty |
|
|
|
|
for (let i = 0; i < data.records.length; i++) { |
|
|
|
|
getClientPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( |
|
|
|
|
res => { |
|
|
|
|
const data = res.data.data; |
|
|
|
|
// eslint-disable-next-line no-empty |
|
|
|
|
for (let j = 0; j < this.deliveryTypeData.length; j++) { |
|
|
|
|
for (let i = 0; i < data.records.length; i++) { |
|
|
|
|
// eslint-disable-next-line no-empty |
|
|
|
|
if (data.records[i].deliveryType == this.deliveryTypeData[j].dictKey) { |
|
|
|
|
data.records[i].deliveryType = this.deliveryTypeData[j].dictValue; |
|
|
|
|
for (let j = 0; j < this.deliveryTypeData.length; j++) { |
|
|
|
|
// eslint-disable-next-line no-empty |
|
|
|
|
if (data.records[i].deliveryType == this.deliveryTypeData[j].dictKey) { |
|
|
|
|
data.records[i].deliveryType = this.deliveryTypeData[j].dictValue; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// for (let j = 0; j < this.orderSourceData.length; j++) { |
|
|
|
|
// // eslint-disable-next-line no-empty |
|
|
|
|
// if (data.records[i].orderSource == this.orderSourceData[j].dictKey) { |
|
|
|
|
// data.records[i].orderSource = this.orderSourceData[j].dictValue; |
|
|
|
|
// } |
|
|
|
|
// } |
|
|
|
|
for (let j = 0; j < this.signingStatusData.length; j++) { |
|
|
|
|
// eslint-disable-next-line no-empty |
|
|
|
|
if (data.records[i].driverSigning == this.signingStatusData[j].dictKey) { |
|
|
|
|
data.records[i].driverSigning = this.signingStatusData[j].dictValue; |
|
|
|
|
// for (let j = 0; j < this.orderSourceData.length; j++) { |
|
|
|
|
// // eslint-disable-next-line no-empty |
|
|
|
|
// if (data.records[i].orderSource == this.orderSourceData[j].dictKey) { |
|
|
|
|
// data.records[i].orderSource = this.orderSourceData[j].dictValue; |
|
|
|
|
// } |
|
|
|
|
// } |
|
|
|
|
for (let j = 0; j < this.signingStatusData.length; j++) { |
|
|
|
|
// eslint-disable-next-line no-empty |
|
|
|
|
if (data.records[i].driverSigning == this.signingStatusData[j].dictKey) { |
|
|
|
|
data.records[i].driverSigning = this.signingStatusData[j].dictValue; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
this.page.total = data.total; |
|
|
|
|
this.data = data.records; |
|
|
|
|
this.loading = false; |
|
|
|
|
// this.selectionClear(); |
|
|
|
|
} |
|
|
|
|
this.page.total = data.total; |
|
|
|
|
this.data = data.records; |
|
|
|
|
this.loading = false; |
|
|
|
|
// this.selectionClear(); |
|
|
|
|
}); |
|
|
|
|
); |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
}; |
|
|
|
|
|
