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

2c2c2c
1 parent 3447dcb8
Showing 2 changed files with 17 additions and 9 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
trash-ui/src/views/ask/ask/index.vue
@@ -81,8 +81,9 @@ public class GarOrderMatchAsk implements Serializable {
     @Excel(name = "运输驾驶员手机号")
     private String garOrderHandlerTel;
     /**
-     * 订单载重
+     * 车辆载重
      */
+    @Excel(name = "车辆载重")
     private Double garCarryingWeight;
     /**
@@ -135,7 +136,7 @@ public class GarOrderMatchAsk implements Serializable {
     /**
      * 接收量
      */
-    @Excel(name = "接收量")
+//    @Excel(name = "接收量")
     private Double garReceptionQuantity;
     /**
@@ -127,7 +127,7 @@
           <span>{{ parseTime(scope.row.garUpdateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="接收量(吨)" align="center" prop="garReceptionQuantity" />
+      <el-table-column label="车辆载重(吨)" align="center" prop="garCarryingWeight" />
       <el-table-column label="趟次类型" align="center" prop="garOrderType" >
         <template slot-scope="scope">
           <span v-if="scope.row.garOrderType == 0">正常趟次</span>
@@ -190,7 +190,7 @@
             <td>联系电话</td>
             <td>{{ form.garOrderPhone || '-' }}</td>
             <td>车次</td>
-            <td>{{ form.dropCarNum || '-' }}</td>
+            <td>{{ dropCarNum }}/{{ form.dropCarNum || '-' }}</td>
           </tr>
           <tr>
             <td>投放地址</td>
@@ -231,8 +231,8 @@
           <tr>
             <td>接收车牌</td>
             <td>{{ form.garHandlerCarCode || '-' }}</td>
-            <td>接收量(吨)</td>
-            <td>{{ form.garReceptionQuantity || '-' }}</td>
+            <td>载重(吨)</td>
+            <td>{{ form.garCarryingWeight || '-' }}</td>
           </tr>
           <!-- 备注 -->
@@ -296,7 +296,6 @@ export default {
         garUpdateBy: null,
         garRemark: null,
         garCarryingWeight: null,
-        garReceptionQuantity: null,
         dropPointId: null,
         dropPointName: null,
         garOrderType: null,
@@ -311,7 +310,8 @@ export default {
       // 表单校验
       rules: {
       },
-      isPrint: false
+      isPrint: false,
+      dropCarNum: 0
     };
   },
   created() {
@@ -380,7 +380,6 @@ export default {
         garUpdateBy: null,
         garRemark: null,
         garCarryingWeight: null,
-        garReceptionQuantity: null,
         dropPointId: null,
         dropPointName: null,
         garOrderType: null,
@@ -411,7 +410,15 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.dropCarNum = 0;
       const garId = row.garId || this.ids
+      listAsk({"garOrderId":row.garOrderId}).then(response => {
+        for(let i = 0;i<response.rows.length;i++){
+          if(response.rows[i].garHandlerCarCode!=null && response.rows[i].garHandlerCarCode !== ''){
+            this.dropCarNum++;
+          }
+        }
+      });
       getAsk(garId).then(response => {
         this.form = response.data;
         this.open = true;