md

src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue

@@ -187,16 +187,15 @@
                 >删除</el-button>
               </el-col>
 
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport"
-                  v-hasPermi="['emis:emisWarehouseIn:export']"
                 >导出</el-button>
-              </el-col> -->
+              </el-col>
           </el-row>
       </div>
 
@@ -357,10 +356,8 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询进仓单列表 */
-    getList() {
-      this.loading = true;
 
+   initQueryParams(){
       // 按运单查询时的处理
       if(this.queryOrderType==2){
         this.queryParams.inNo=this.queryParams.queryKey;
@@ -379,7 +376,15 @@ export default {
         thisQueryParams = this.addDateRange(this.queryParams, this.dateTimeRange,"pickStartDate");
       }
 
-      listEmisWarehouseIn(thisQueryParams).then(response => {
+          return thisQueryParams;
+    },
+    /** 查询进仓单列表 */
+    getList() {
+      this.loading = true;
+
+      let qParam=this.initQueryParams();
+
+      listEmisWarehouseIn(qParam).then(response => {
         this.emisWarehouseInList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -475,47 +480,199 @@ export default {
     },
    /** 导出按钮操作 */
    handleExport() {
-    //   this.download('emis/emisWarehouseIn/export', {
-    //     ...this.queryParams
-    //   }, `emisWarehouseIn_${new Date().getTime()}.xlsx`)
       const loadingInstance = this.$loading({
             text: '正在导出...'
       })
-       var qParam = {...this.queryParams};
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
 
-       listEmisWarehouseIn(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+      if(this.selectionList&&this.selectionList.length>0){
-        this.downloadLoading = false
+        this.exportData(this.selectionList,loadingInstance);
+      }
+      else{
+          let qExportParam=this.initQueryParams();
+          qExportParam.pageNum=1;
+          qExportParam.pageSize=5000;
+
+          listEmisWarehouseIn(qExportParam).then(response => {
             if (response.code === 200) {
-                const curList = response.rows
+              this.exportData(response.rows,loadingInstance);
+            }
+          });
+      }
+    },
+    exportData(selData,loadingInstance){
+      const curList =selData
       import('@/vendor/Export2Excel').then(excel => {
-                  const tHeader = ['id','进仓序列号','进仓单号','订单号','运单号','客户编号','客户名称','进仓日期','客户确认状态','确认时间','占用状态','状态','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
+        const exportParam=this.$refs.refTable.getExportParam();
-                  const filterVal = ['id','serialNo','inNo','orderSn','billCode','customerCode','customerName','entryDate','confirmStatus','confirmDate','usedStatus','status','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
+        const tHeader = exportParam.header;
-                  const data = this.formatJson(filterVal, curList, response.rows)
+        const filterVal = exportParam.filter;
+        const data = this.formatJson(filterVal, curList, selData)
         excel.export_json_to_excel({
           header: tHeader,
           data,
-                    filename: '进仓单',
+          filename: '账单导出',
           autoWidth: true
         })
         loadingInstance.close()
       })
-        }
-      });
     },
     formatJson(filterVal, jsonData, resData) {
       let index = 0
       return jsonData.map(v => filterVal.map(j => {
+
+        console.log("===>1111===>",v);
+
         if (j === 'index') {
           return ++index
         }
-        if (j === 'status') {
+        if (j === 'kjlx') {
-          var statusStr='xxx'
+          return v['waybillDetail']['sendSiteName']+'--'+v['waybillDetail']['dispatchUnderlingSiteName'];
-          if(v[j] == 10){
-              statusStr='xxx'
         }
-          return statusStr;
+        if (j === 'fjr') {
+          return v['sendName']+'--'+v['receiveName'];
+        }
+
+        if (j === 'waybillDetail.sendSiteName') {
+          return  v['waybillDetail']['sendSiteName'];
+        }
+
+
+        if (j === 'waybillDetail.sendDate') {
+          return  v['waybillDetail']['sendDate'];
+        }
+
+        if (j === 'waybillDetail.sendCompany') {
+          return  v['waybillDetail']['sendCompany'];
+        }
+
+        if (j === 'waybillDetail.transLineTypeName') {
+          return  v['waybillDetail']['transLineTypeName'];
+        }
+
+        if (j === 'waybillDetail.productTypeName') {
+          return  v['waybillDetail']['productTypeName'];
+        }
+
+
+        if (j === 'waybillDetail.sendName') {
+          return  v['waybillDetail']['sendName'];
+        }
+
+        if (j === 'waybillDetail.parcelQty') {
+          return  v['waybillDetail']['parcelQty'];
+        }
+
+        if (j === 'waybillDetail.billWeight') {
+          return  v['waybillDetail']['billWeight'];
+        }
+
+        if (j === 'waybillDetail.volumeWeight') {
+          return  v['waybillDetail']['volumeWeight'];
+        }
+
+        if (j === 'waybillDetail.totalVolume') {
+          return  v['waybillDetail']['totalVolume'];
+        }
+
+        if (j === 'waybillDetail.settlementWeight') {
+          return  v['waybillDetail']['settlementWeight'];
+        }
+
+        if (j === 'waybillDetail.freight') {
+          return  v['waybillDetail']['freight'];
+        }
+
+        if (j === 'waybillDetail.realFee') {
+          return  v['waybillDetail']['realFee'];
+        }
+
+        if (j === 'waybillDetail.remark') {
+          return  v['waybillDetail']['remark'];
+        }
+
+        if (j === 'waybillDetail.feeRemark') {
+          return  v['waybillDetail']['feeRemark'];
+        }
+
+        if (j === 'waybillDetail.salesmen') {
+          return  v['waybillDetail']['salesmen'];
+        }
+
+        if (j === 'waybillDetail.payee') {
+          return  v['waybillDetail']['payee'];
+        }
+
+        if (j === 'waybillDetail.payee') {
+          return  v['waybillDetail']['payee'];
+        }
+
+        if (j === 'waybillDetail.problemTypeName') {
+          return  v['waybillDetail']['problemTypeName'];
+        }
+
+        if (j === 'waybillDetail.problemCause') {
+          return  v['waybillDetail']['problemCause'];
+        }
+
+        if (j === 'waybillDetail.sendMobile') {
+          return "";
+        }
+
+        if (j === 'waybillDetail.calcFeeType') {
+          return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['waybillDetail']['calcFeeType']);
+        }
+
+        if (j === 'waybillDetail.paymentStatus') {
+          return this.selectDictLabel(this.dict.type.emis_payment_status,v['waybillDetail']['paymentStatus']);
+        }
+
+        if (j === 'waybillDetail.pickupMethod') {
+          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v['waybillDetail']['pickupMethod']);
+        }
+        if (j === 'waybillDetail.customsEclaration') {
+          return this.selectDictLabel(this.dict.type.emis_declare_mode,v['waybillDetail']['customsEclaration']);
+        }
+        if (j === 'waybillDetail.customsClear') {
+          return this.selectDictLabel(this.dict.type.emis_customs_clear,v['waybillDetail']['customsClear']);
+        }
+        if (j === 'waybillDetail.packType') {
+          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v['waybillDetail']['packType']);
+        }
+
+        if (j === 'waybillDetail.dispatchMethod') {
+          if(v['waybillDetail']['dispatchMethod'] == 1){
+            return '派送';
+          }else{
+            return '自提';
+          }
+        }
+
+
+
+
+
+        if (j === 'waybillDetail.blMessage') {
+          if(v['waybillDetail']['blMessage']  == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'waybillDetail.blAcceptMessage') {
+          if(v['waybillDetail']['blAcceptMessage']   == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'waybillDetail.blSign') {
+          if(v['waybillDetail']['blSign'] == 1){
+            return '已签收';
+          }else{
+            return '未签收';
+          }
+        }
+        if (j === 'waybillDetail.paymentType') {
+          return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
         }
         return v[j]
       }))

src/views/emis/emisWaybill/waybillRecord.vue

@@ -1519,7 +1519,7 @@ methods: {
             }
 
             // 把进仓单带过来
-            if( this.form.intoWarehouseBillCode && (this.form.pickMethod==1||this.form.pickMethod==3) ){
+            if( this.form.intoWarehouseBillCode && (this.form.pickupMethod==1||this.form.pickupMethod==3) ){
               this.form.warehouseInNo=this.form.intoWarehouseBillCode;
             }