|
@@ -210,6 +210,24 @@
|
|
|
@click="openDeliveryNote"
|
|
|
>批量导入物流单号</el-button>
|
|
|
</el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="warning"
|
|
|
+ icon="el-icon-download"
|
|
|
+ size="mini"
|
|
|
+ @click="handleExportDetails"
|
|
|
+ v-hasPermi="['store:storeOrder:export:details']"
|
|
|
+ >导出订单(明文)</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="warning"
|
|
|
+ icon="el-icon-download"
|
|
|
+ size="mini"
|
|
|
+ @click="handleExportItemsDetails"
|
|
|
+ v-hasPermi="['store:storeOrder:exportItems:details']"
|
|
|
+ >导出订单明细(明文)</el-button>
|
|
|
+ </el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="danger"
|
|
@@ -591,7 +609,7 @@ import {
|
|
|
updateStoreOrder,
|
|
|
exportStoreOrder,
|
|
|
getOrderItemsNum,
|
|
|
- importDeliveryNoteExpressTemplate
|
|
|
+ importDeliveryNoteExpressTemplate, exportStoreOrderDetails, exportStoreOrderItemsDetails
|
|
|
} from '@/api/hisStore/storeOrder'
|
|
|
import { getUserList } from "@/api/hisStore/user";
|
|
|
import { getAddressList } from "@/api/hisStore/userAddress";
|
|
@@ -1126,7 +1144,7 @@ export default {
|
|
|
this.download(response.msg);
|
|
|
}).catch(function() {});
|
|
|
},
|
|
|
- handleExportItems() {
|
|
|
+ handleExportItemsDetails() {
|
|
|
if(this.queryParams.status=='00'){
|
|
|
this.queryParams.status=null;
|
|
|
}
|
|
@@ -1160,11 +1178,90 @@ export default {
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
|
}).then(function() {
|
|
|
- return exportStoreOrderItems(queryParams);
|
|
|
+ return exportStoreOrderItemsDetails(queryParams);
|
|
|
}).then(response => {
|
|
|
this.download(response.msg);
|
|
|
}).catch(function() {});
|
|
|
},
|
|
|
+ /** 导出按钮操作 */
|
|
|
+ handleExportDetails() {
|
|
|
+ if(this.queryParams.status=='00'){
|
|
|
+ this.queryParams.status=null;
|
|
|
+ }
|
|
|
+ if(this.createTimeRange!=null&&this.createTimeRange.length==2){
|
|
|
+ this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.queryParams.createTimeRange=null;
|
|
|
+ }
|
|
|
+ if(this.payTimeRange!=null&&this.payTimeRange.length==2){
|
|
|
+ this.queryParams.payTimeRange=this.payTimeRange[0]+"--"+this.payTimeRange[1]
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.queryParams.payTimeRange=null;
|
|
|
+ }
|
|
|
+ if(this.deliveryImportTimeRange!=null&&this.deliveryImportTimeRange.length==2){
|
|
|
+ this.queryParams.deliveryImportTimeRange=this.deliveryImportTimeRange[0]+"--"+this.deliveryImportTimeRange[1]
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.queryParams.deliveryImportTimeRange=null;
|
|
|
+ }
|
|
|
+ if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
|
|
|
+ this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.queryParams.deliverySendTimeRange=null;
|
|
|
+ }
|
|
|
+ const queryParams = this.addDateRange(this.queryParams, this.dateRange);
|
|
|
+ this.$confirm('是否确认导出所有订单数据项?', "警告", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(function() {
|
|
|
+ return exportStoreOrderDetails(queryParams);
|
|
|
+ }).then(response => {
|
|
|
+ this.download(response.msg);
|
|
|
+ }).catch(function() {});
|
|
|
+ },
|
|
|
+ handleExportItems() {
|
|
|
+ if(this.queryParams.status=='00'){
|
|
|
+ this.queryParams.status=null;
|
|
|
+ }
|
|
|
+ if(this.createTimeRange!=null&&this.createTimeRange.length==2){
|
|
|
+ this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.queryParams.createTimeRange=null;
|
|
|
+ }
|
|
|
+ if(this.payTimeRange!=null&&this.payTimeRange.length==2){
|
|
|
+ this.queryParams.payTimeRange=this.payTimeRange[0]+"--"+this.payTimeRange[1]
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.queryParams.payTimeRange=null;
|
|
|
+ }
|
|
|
+ if(this.deliveryImportTimeRange!=null&&this.deliveryImportTimeRange.length==2){
|
|
|
+ this.queryParams.deliveryImportTimeRange=this.deliveryImportTimeRange[0]+"--"+this.deliveryImportTimeRange[1]
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.queryParams.deliveryImportTimeRange=null;
|
|
|
+ }
|
|
|
+ if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
|
|
|
+ this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.queryParams.deliverySendTimeRange=null;
|
|
|
+ }
|
|
|
+ const queryParams = this.addDateRange(this.queryParams, this.dateRange);
|
|
|
+ this.$confirm('是否确认导出所有订单明细数据项?', "警告", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(function() {
|
|
|
+ return exportStoreOrderItems(queryParams);
|
|
|
+ }).then(response => {
|
|
|
+ this.download(response.msg);
|
|
|
+ }).catch(function() {});
|
|
|
+ },
|
|
|
handleImport() {
|
|
|
this.upload.title = "导入银行回单";
|
|
|
this.upload.open = true;
|