diff --git a/src/views/emis/emisCustomerUser/monthUserForm.vue b/src/views/emis/emisCustomerUser/monthUserForm.vue
index fd21ea52..e1db5523 100644
--- a/src/views/emis/emisCustomerUser/monthUserForm.vue
+++ b/src/views/emis/emisCustomerUser/monthUserForm.vue
@@ -89,8 +89,8 @@
>
-
-
+
+
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
index 8f856208..1bce6ea5 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
@@ -283,168 +283,6 @@
-
-
-
-
-
-
-
- 运单号
- 订单号
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 下单时间
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
- 追加
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.sendCountryName }}
-
-
-
-
- {{ scope.row.receiveCountryName }}
-
-
-
-
-
-
- {{ parseTime(scope.row.estimateDate || "") }}
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.receiveCompany }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.sendCompany }}
-
-
-
-
- {{ scope.row.remark }}
-
-
-
-
-
-
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
index 4f2a2731..433b85ef 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
@@ -121,24 +121,25 @@
@click="handleDelete"
v-hasPermi="['emis:emisTmsSiteBatch:remove']"
>删除
-
-
导出
+ 导出批次明细
+
@@ -210,6 +211,7 @@ import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vu
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
import { parseTime, dateToStr } from "@/utils/custom";
import { formatSearchStr } from '@/utils/index'
+import { listEmisTmsSiteBatchDtl} from "@/api/emis/emisTmsSiteBatchDtl";
import PackListView from '@/views/emis/emisTmsSiteBatch/packListView';
@@ -420,9 +422,7 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
- handleDown(){
- },
/** 修改按钮操作 */
handleUpdate() {
// let id = this.ids[0]
@@ -554,6 +554,118 @@ export default {
}))
},
+ handleDownBatchDtl(batchName){
+ const loadingInstance = this.$loading({
+ text: '正在导出...'
+ })
+
+ if(this.selectionList&&this.selectionList.length>0){
+ this.selectionList.forEach(item=>{
+ let qExportParam={
+ pageNum:1,
+ pageSize:20000,
+ batchNo: item.batchNo
+ };
+ listEmisTmsSiteBatchDtl(qExportParam).then(response => {
+ if (response.code === 200) {
+ this.exportDataDtl(response.rows,loadingInstance);
+ }
+ });
+
+ });
+ }
+ },
+ exportDataDtl(batchName,selData,loadingInstance){
+ const curList =selData
+ import('@/vendor/Export2Excel').then(excel => {
+ const tHeader = ['运单号','寄件国家','目的国家','线路','产品类型','预计到达时间','总件数','实际重量','总体积','体积重量','结算重量','收件人','收件公司','取件方式','付款方式','运费','寄件人','寄件公司','录单备注','寄件网点'];
+ const filterVal = [''];
+ const data = this.formatJsonDtl(filterVal, curList, selData)
+ excel.export_json_to_excel({
+ header: tHeader,
+ data,
+ filename: batchName+'-批次明细表',
+ autoWidth: true
+ })
+ loadingInstance.close()
+ })
+ },
+ formatJsonDtl(filterVal, jsonData, resData) {
+ let index = 0
+ return jsonData.map(v => filterVal.map(j => {
+
+ if (j === 'index') {
+ return ++index
+ }
+ if (j === 'kjlx') {
+ return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
+ }
+ if (j === 'fjr') {
+ return v['sendName']+'--'+v['receiveName'];
+ }
+ if (j === 'custName') {
+ let paymentType=v['paymentType'];
+ if(paymentType==2 || paymentType==4 || paymentType==5 ){
+ return v['custName'];
+ }else{
+ return "";
+ }
+ }
+
+ if (j === 'sendMobile') {
+ return "";
+ }
+ if (j === 'paymentStatus') {
+ return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
+ }
+
+ if (j === 'pickupMethod') {
+ return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
+ }
+ if (j === 'customsEclaration') {
+ return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
+ }
+ if (j === 'customsClear') {
+ return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
+ }
+ if (j === 'packType') {
+ return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
+ }
+
+ if (j === 'dispatchMethod') {
+ if(v[j] == 1){
+ return '派送';
+ }else{
+ return '自提';
+ }
+ }
+ if (j === 'blMessage') {
+ if(v[j] == 1){
+ return '发送';
+ }else{
+ return '不发送';
+ }
+ }
+ if (j === 'blAcceptMessage') {
+ if(v[j] == 1){
+ return '发送';
+ }else{
+ return '不发送';
+ }
+ }
+ if (j === 'blSign') {
+ if(v[j] == 1){
+ return '已签收';
+ }else{
+ return '未签收';
+ }
+ }
+ if (j === 'paymentType') {
+ return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
+ }
+ return v[j]
+ }))
+ },
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1