电子联单bug 修复，导出联单，打印联单

2c2c2c
1 parent a8cd92b6
Showing 3 changed files with 46 additions and 40 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarOrderMatchAskController.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
trash-ui/src/views/ask/ask/index.vue
@@ -49,7 +49,7 @@ public class GarOrderMatchAskController extends BaseController
     {
         List<GarOrderMatchAsk> list = garOrderMatchAskService.selectGarOrderMatchAskList(garOrderMatchAsk);
         ExcelUtil<GarOrderMatchAsk> util = new ExcelUtil<GarOrderMatchAsk>(GarOrderMatchAsk.class);
-        return util.exportExcel(list, "ask");
+        return util.exportExcel(list, "装修垃圾收运处电子联单");
     }
     /**
@@ -30,14 +30,15 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
     private String garId;
     /**
-     * 订单 id
+     * 订单编号
      */
+    @Excel(name = "订单编号")
     private String garOrderId;
     /**
-     * 订单编号
+     * 联单编号
      */
-    @Excel(name = "订单编号")
+    @Excel(name = "联单编号")
     private String garOrderNumber;
     /**
@@ -48,6 +49,13 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
     @Excel(name = "运输开始时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date garOrderTime;
+
+    /**
+     * 订单下单用户名称
+     */
+    @Excel(name = "下单用户名称")
+    private String garOrderName;
+
     /**
      * 订单下单手机号
      */
@@ -55,10 +63,17 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
     private String garOrderPhone;
     /**
-     * 订单下单用户名称
+     * 投放点地址
      */
-    @Excel(name = "下单用户名称")
-    private String garOrderName;
+    @Excel(name = "投放地址")
+    private String dropAddress;
+
+
+    /**
+     * 运输驾驶员
+     */
+    @Excel(name = "运输驾驶员")
+    private String garOrderHandlerName;
     /**
          * 运输驾驶员手机号
@@ -71,12 +86,6 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
     private Double garCarryingWeight;
     /**
-     * 运输驾驶员
-     */
-    @Excel(name = "运输驾驶员")
-    private String garOrderHandlerName;
-
-    /**
      * 车次
      */
     @Excel(name = "车次")
@@ -124,6 +133,12 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
     private Date garUpdateTime;
     /**
+     * 接收量
+     */
+    @Excel(name = "接收量")
+    private Double garReceptionQuantity;
+
+    /**
      * 
      */
     @TableField(fill = FieldFill.INSERT)
@@ -136,39 +151,23 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
     private String garUpdateBy;
     /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    private String garRemark;
-
-    /**
      * 趟次类型0=正常趟次,1=异常趟次
      */
     @Excel(name = "趟次类型",readConverterExp = "0=正常趟次,1=异常趟次")
     private String garOrderType;
     /**
-     * 投放点 id
+     * 备注
      */
-    private int dropPointId;
+    @Excel(name = "备注")
+    private String garRemark;
     /**
-     * 投放点名称
+     * 投放点 id
      */
-    @Excel(name = "投放点名称")
-    private String dropPointName;
+    private int dropPointId;
-    /**
-     * 投放点管理员联系方式
-     */
-    @Excel(name = "投放点管理员联系方式")
-    private String dropCustodianPhone;
-    /**
-     * 投放点地址
-     */
-    @Excel(name = "投放点地址")
-    private String dropAddress;
     /**
@@ -189,11 +188,18 @@ public class GarOrderMatchAsk extends BaseEntity implements Serializable {
     @Excel(name = "到达处置场所车牌号")
     private String garHandlerCarCodeEnd;
+
     /**
-     * 接收量
+     * 投放点名称
      */
-    @Excel(name = "接收量")
-    private Double garReceptionQuantity;
+    @Excel(name = "投放点名称")
+    private String dropPointName;
+
+    /**
+     * 投放点管理员联系方式
+     */
+    @Excel(name = "投放点管理员联系方式")
+    private String dropCustodianPhone;
     public Date getGarOrderTime() {
         return garOrderTime;
@@ -110,14 +110,14 @@
     <el-table v-loading="loading" :data="askList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="订单 id" align="center" prop="garOrderId" />
+      <el-table-column label="订单编号" align="center" prop="garOrderId" />
       <el-table-column label="联单编号" align="center" prop="garOrderNumber" />
       <el-table-column label="订单生成时间" align="center" prop="garCreateTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.garCreateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="投放点" align="center" prop="dropPointName" />
+      <el-table-column label="下单人" align="center" prop="garOrderName" />
       <el-table-column label="运输企业" align="center" prop="garOrderHandlerCompanyName" />
       <el-table-column label="运输驾驶员" align="center" prop="garOrderHandlerName" />
       <el-table-column label="车牌号" align="center" prop="garHandlerCarCode" />
@@ -429,7 +429,7 @@ export default {
         }).then(function() {
           return exportAsk(queryParams);
         }).then(response => {
-          this.download(response.msg);
+          this.download(response.message);
         })
     }
   }