zhongtianhaoyuan 1 éve
szülő
commit
6e77956b4f

+ 3 - 1
src/views/administrationManagement/dailyReport.vue

@@ -257,7 +257,9 @@ export default {
                   that.modification = []
                   that.modification = []
                   that.getList()
                   that.getList()
                 }
                 }
-              })
+              }).catch(() => {
+                that.modification = []
+              });
           })
           })
       } else {
       } else {
         this.$message.error('至少选中一条可上报的条目!')
         this.$message.error('至少选中一条可上报的条目!')

+ 4 - 1
src/views/administrationManagement/waybillReporting.vue

@@ -238,7 +238,10 @@ export default {
                 }
                 }
                 that.getList()
                 that.getList()
                 that.modification = []
                 that.modification = []
-              })
+              }).catch(() => {
+                that.modification = []
+              });
+              
           })
           })
       } else {
       } else {
         this.$message.error('至少选中一条可上报的条目!')
         this.$message.error('至少选中一条可上报的条目!')

+ 3 - 1
src/views/parkReportManagement/dailyReport.vue

@@ -261,7 +261,9 @@ export default {
                   that.modification = []
                   that.modification = []
                   that.getList()
                   that.getList()
                 }
                 }
-              })
+              }).catch(() => {
+                that.modification = []
+              });
           })
           })
       } else {
       } else {
         this.$message.error('至少选中一条可上报的条目!')
         this.$message.error('至少选中一条可上报的条目!')

+ 16 - 11
src/views/parkReportManagement/waybillReporting.vue

@@ -58,13 +58,14 @@
         <el-table-column prop="cargoOwnerPhone" label="发运人账号" />
         <el-table-column prop="cargoOwnerPhone" label="发运人账号" />
         <el-table-column prop="driverName" label="承运人" />
         <el-table-column prop="driverName" label="承运人" />
         <el-table-column prop="driverPhone" label="承运人账号" />
         <el-table-column prop="driverPhone" label="承运人账号" />
-        <el-table-column prop="orderEndDate" label="订单完结时间" min-width="110"/>
+        <el-table-column prop="orderEndDate" label="订单完结时间" min-width="110" />
         <el-table-column prop="escalationStatus" label="状态">
         <el-table-column prop="escalationStatus" label="状态">
           <template slot-scope="scope1">
           <template slot-scope="scope1">
-            <span>{{scope1.row.escalationStatus}}</span>
-              <el-tooltip class="item" effect="dark" :content="scope1.row.escalationFailureReason" placement="top" v-if="scope1.row.escalationStatus == '未通过'">
-                 <img src="../../../public/img/wenhao.png" alt="" class="ask_css" />
-              </el-tooltip>
+            <span>{{ scope1.row.escalationStatus }}</span>
+            <el-tooltip class="item" effect="dark" :content="scope1.row.escalationFailureReason" placement="top"
+              v-if="scope1.row.escalationStatus == '未通过'">
+              <img src="../../../public/img/wenhao.png" alt="" class="ask_css" />
+            </el-tooltip>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
         <el-table-column label="操作" min-width="200">
         <el-table-column label="操作" min-width="200">
@@ -94,14 +95,14 @@
         <div class="right_title">托运方证件号或信用代码</div>
         <div class="right_title">托运方证件号或信用代码</div>
         <div class="right_item" v-if="orderData.cargoOwnerIdCard">{{ orderData.cargoOwnerIdCard }}</div>
         <div class="right_item" v-if="orderData.cargoOwnerIdCard">{{ orderData.cargoOwnerIdCard }}</div>
         <div class="right_item" v-else>{{ orderData.hyCompanyInfo ? orderData.hyCompanyInfo.unifiedSocialCreditCode :
         <div class="right_item" v-else>{{ orderData.hyCompanyInfo ? orderData.hyCompanyInfo.unifiedSocialCreditCode :
-            "暂无"
+          "暂无"
         }}
         }}
         </div>
         </div>
         <div class="right_title">收货联系人</div>
         <div class="right_title">收货联系人</div>
         <div class="right_item">{{ orderData.publishTaskInfo.receiver }}</div>
         <div class="right_item">{{ orderData.publishTaskInfo.receiver }}</div>
         <div class="right_title">收货方证件号或信用代码</div>
         <div class="right_title">收货方证件号或信用代码</div>
         <div class="right_item">{{ orderData.publishTaskInfo.receiverIdcard ? orderData.publishTaskInfo.receiverIdcard :
         <div class="right_item">{{ orderData.publishTaskInfo.receiverIdcard ? orderData.publishTaskInfo.receiverIdcard :
-            orderData.publishTaskInfo.receiverCreditCode
+          orderData.publishTaskInfo.receiverCreditCode
         }}</div>
         }}</div>
         <div class="right_title">运费</div>
         <div class="right_title">运费</div>
         <div class="right_item">{{ orderData.freight }}</div>
         <div class="right_item">{{ orderData.freight }}</div>
@@ -112,13 +113,13 @@
         <div class="right_title">发货地址</div>
         <div class="right_title">发货地址</div>
         <div class="right_item">
         <div class="right_item">
           {{ orderData.sendPrivate }}{{ orderData.sendCity }}{{ orderData.sendArea }}{{
           {{ orderData.sendPrivate }}{{ orderData.sendCity }}{{ orderData.sendArea }}{{
-              orderData.sendDetailedAddress
+            orderData.sendDetailedAddress
           }}
           }}
         </div>
         </div>
         <div class="right_title">收货地址</div>
         <div class="right_title">收货地址</div>
         <div class="right_item">
         <div class="right_item">
           {{ orderData.unloadPrivate }}{{ orderData.unloadCity }}{{ orderData.unloadArea }}{{
           {{ orderData.unloadPrivate }}{{ orderData.unloadCity }}{{ orderData.unloadArea }}{{
-              orderData.unloadDetailedAddress
+            orderData.unloadDetailedAddress
           }}
           }}
         </div>
         </div>
         <div class="right_title">司机姓名</div>
         <div class="right_title">司机姓名</div>
@@ -130,7 +131,7 @@
         <div class="right_title">货名</div>
         <div class="right_title">货名</div>
         <div class="right_item">{{ orderData.goodsName }}</div>
         <div class="right_item">{{ orderData.goodsName }}</div>
         <div class="right_title">重量(kg)</div>
         <div class="right_title">重量(kg)</div>
-        <div class="right_item">{{orderData.hyCarrierInfo.unloadingWeight}}</div>
+        <div class="right_item">{{ orderData.hyCarrierInfo.unloadingWeight }}</div>
         <div class="right_btn">
         <div class="right_btn">
           <el-button @click="rightSee = false">关闭</el-button>
           <el-button @click="rightSee = false">关闭</el-button>
         </div>
         </div>
@@ -235,10 +236,13 @@ export default {
                     message: '上报成功!',
                     message: '上报成功!',
                     type: 'success'
                     type: 'success'
                   })
                   })
+                  // this.modification = 
                 }
                 }
                 that.getList()
                 that.getList()
                 that.modification = []
                 that.modification = []
-              })
+              }).catch(() => {
+                that.modification = []
+              });
           })
           })
       } else {
       } else {
         this.$message.error('至少选中一条可上报的条目!')
         this.$message.error('至少选中一条可上报的条目!')
@@ -630,6 +634,7 @@ export default {
     margin-top: 10px;
     margin-top: 10px;
   }
   }
 }
 }
+
 .find::v-deep input.el-input__inner {
 .find::v-deep input.el-input__inner {
   border-radius: 0;
   border-radius: 0;
 }
 }