|
|
@@ -121,6 +121,7 @@
|
|
|
<!-- <a-button type="primary" @click.stop="addShipDet" icon="plus">新增</a-button> -->
|
|
|
<a-button type="primary" @click.stop="referOrderDataOpen" icon="plus">参照订单数据</a-button>
|
|
|
<a-button type="primary" icon="download" @click="handleExportXls('箱单数据')">箱单数据导出</a-button>
|
|
|
+ <a-button type="primary" icon="download" @click="exportXlsShipment('明细')">明细导出</a-button>
|
|
|
<a-button type="primary" icon="check" @click="submit">批量提交</a-button>
|
|
|
<a-button type="primary" icon="close" @click="cancelSubmit">批量取消提交</a-button>
|
|
|
</div>
|
|
|
@@ -731,6 +732,29 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
|
|
|
+ //明细导出
|
|
|
+ exportXlsShipment(fileName){
|
|
|
+ downFile('/shippingDetails/syShippingDetails/exportXlsShipping',this.queryParam).then(data => {
|
|
|
+ if (!data) {
|
|
|
+ this.$message.warning('文件下载失败')
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (typeof window.navigator.msSaveBlob !== 'undefined') {
|
|
|
+ window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xlsx')
|
|
|
+ } else {
|
|
|
+ let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
|
|
|
+ let link = document.createElement('a')
|
|
|
+ link.style.display = 'none'
|
|
|
+ link.href = url
|
|
|
+ link.setAttribute('download', fileName + '.xlsx')
|
|
|
+ document.body.appendChild(link)
|
|
|
+ link.click()
|
|
|
+ document.body.removeChild(link) // 下载完成移除元素
|
|
|
+ window.URL.revokeObjectURL(url) // 释放掉blob对象
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
// 编辑
|
|
|
edit(record) {
|
|
|
this.$refs.editShipDetDrawer.visible = true
|
|
|
@@ -887,6 +911,8 @@ export default {
|
|
|
this.toggleSearchStatus = false
|
|
|
if(this.queryParam.flourOrGarment === '' || !this.queryParam.hasOwnProperty('flourOrGarment')){
|
|
|
this.$message.error('请选择查询类型！');
|
|
|
+ }else if(this.queryParam.flourOrGarment == '0' && this.preDeliveryDate.length == 0){
|
|
|
+ this.$message.error('请选择预发货时间！');
|
|
|
}else{
|
|
|
if(this.preDeliveryDate.length ==2){
|
|
|
var separator = "-"; //日期分隔符
|
jbb