运单/流水单上报

src/api/parkReportManagement.js

@@ -4,18 +4,18 @@ export function getList(data) {
   return request({
     url: '/driverInfo/selectDriverInfoSubmission',
     method: 'get',
-     params: data,
+    params: data,
   })
 }
 //上报
 export function report(data) {
-    return request({
-      url: '/driverInfo/api/batchSubmission',
-      method: 'post',
-       data: data,
-    })
-  }
-  //查看单条数据
+  return request({
+    url: '/driverInfo/api/batchSubmission',
+    method: 'post',
+    data: data,
+  })
+}
+//查看单条数据
 export function getInfo(data) {
   return request({
     url: '/driverInfo/getDriver',
@@ -28,7 +28,7 @@ export function carGetList(data) {
   return request({
     url: '/driverCarInfo/selectCarInfoSubmission',
     method: 'get',
-     params: data,
+    params: data,
   })
 }
 //车辆上报
@@ -36,15 +36,78 @@ export function carReport(data) {
   return request({
     url: '/driverCarInfo/api/batchSubmission',
     method: 'post',
-     data: data,
-  })
-}
-  //查看单条数据
-  export function carGetInfo(data) {
-    return request({
-      url: '/driverCarInfo/getDriverCarInfo',
-      method: 'get',
-      params: data,
-    })
-  }
-
+    data: data,
+  })
+}
+//查看单条数据
+export function carGetInfo(data) {
+  return request({
+    url: '/driverCarInfo/getDriverCarInfo',
+    method: 'get',
+    params: data,
+  })
+}
+// 运单上报列表
+export function waybillGetList(data) {
+  return request({
+    url: '/orderInfo/selectWaybillReporting',
+    method: 'get',
+    params: data,
+  })
+}
+//查看运单数据
+export function waybillGetInfo(data) {
+  return request({
+    url: '/orderInfo/getOrderInfo',
+    method: 'get',
+    params: data,
+  })
+}
+//运单暂缓上报
+export function deferEscalation(data) {
+  return request({
+    url: '/orderInfo/api/postponeReporting',
+    method: 'post',
+    data: data,
+  })
+}
+//运单批量上报
+export function batchEscalation(data) {
+  return request({
+    url: '/orderInfo/api/postponeReporting',
+    method: 'post',
+    data: data,
+  })
+}
+// 流水单上报列表
+export function dailyReportGetList(data) {
+  return request({
+    url: '/hyFreightSettlementInfo/selectFlowSheet',
+    method: 'get',
+    params: data,
+  })
+}
+//查看流水单数据
+export function dailyReporGetInfo(data) {
+  return request({
+    url: '/hyFreightSettlementInfo/getHyFreightSettlementInfo',
+    method: 'get',
+    params: data,
+  })
+}
+//流水单暂缓上报
+export function dailyReportDeferEscalation(data) {
+  return request({
+    url: '/hyFreightSettlementInfo/api/postponeReporting',
+    method: 'post',
+    data: data,
+  })
+}
+//流水单批量上报
+export function dailyReportBatchEscalation(data) {
+  return request({
+    url: '/hyFreightSettlementInfo/api/batchSubmission',
+    method: 'post',
+    data: data,
+  })
+}

src/views/parkReportManagement/dailyReport.vue

@@ -53,20 +53,21 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="orderNo" label="订单编号" />
-        <el-table-column prop="compilationUnit" label="收款人" />
-        <el-table-column prop="editor" label="司机账号" />
-        <el-table-column prop="updateDate" label="流水号" />
-        <el-table-column prop="updateDate" label="金额(元)" />
-        <el-table-column prop="updateDate" label="类型" />
-        <el-table-column prop="status" label="状态" />
-        <el-table-column prop="updateDate" label="付款时间" />
+        <el-table-column prop="orderNo" label="订单编号" min-width="100" />
+        <el-table-column prop="driverName" label="收款人" />
+        <el-table-column prop="driverPhone" label="司机账号" />
+        <el-table-column prop="serialNumber" label="流水号" />
+        <el-table-column prop="amountMoney" label="金额(元)" />
+        <el-table-column prop="paymentType" label="类型" />
+        <el-table-column prop="escalationStatus" label="状态" />
+        <el-table-column prop="paymentDate" label="付款时间" min-width="100" />
         <el-table-column label="操作" min-width="200">
           <template slot-scope="scope">
             <el-link target="_blank" @click="look(scope.row)" type="primary" :underline="false">查看</el-link>
             <el-divider direction="vertical" />
             <el-link target="_blank" type="primary" :underline="false" @click="submission(scope.row)"
-              v-if="scope.row.search == 1 || scope.row.search == 4 || scope.row.status == '暂缓中'">上报</el-link>
+              :disabled="scope.row.escalationStatus != '未上报' && scope.row.escalationStatus != '未通过' && scope.row.escalationStatus != '暂缓中'">
+              上报</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -75,116 +76,53 @@
       :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"
       @size-change="handleSizeChange" @current-change="handleCurrentChange" />
 
-    <el-drawer title="运单信息" :visible.sync="rightSee" style="overflow-y: auto !important">
+    <el-drawer title="流水单信息" :visible.sync="rightSee" style="overflow-y: auto !important">
       <div class="right_css">
-        <div class="right_item">订单编号：{{ orderData.compilationUnit }}</div>
-        <div class="right_title">发货时间</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_title">收货时间</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_title">托运方</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_title">托运方证件号或信用代码</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_title">收货方</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_title">收货方证件号或信用代码</div>
-        <div class="right_title">运费</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
+        <div class="right_item">单证号：{{ dailyReportData.documentNo }}</div>
+        <div class="right_title">实际承运人</div>
+        <div class="right_item">{{ dailyReportData.driverName }} </div>
+        <div class="right_title">实际承运人统一社会信用代码或证件号码</div>
+        <div class="right_item">{{ dailyReportData.driverIdCard }}</div>
         <div class="right_title">车牌号</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
+        <div class="right_item">{{ dailyReportData.carNumber }}</div>
         <div class="right_title">车牌颜色</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_title">发货地址</div>
-        <div class="right_item">
-          {{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{
-              orderData.compilationUnit
-          }}
-        </div>
-        <div class="right_title">收货地址</div>
-        <div class="right_item">
-          {{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{
-              orderData.compilationUnit
-          }}
-        </div>
+        <div class="right_item">{{ dailyReportData.carNumberColour }}</div>
+        <div class="right_title">运单号</div>
+        <div class="right_item">{{ dailyReportData.orderNo }}</div>
+        <div class="right_title">分段分单号</div>
+        <div class="right_item">{{ '0000' }}</div>
+        <div class="right_title">总金额</div>
+        <div class="right_item">{{ dailyReportData.amountMoney }}</div>
+        <div class="right_title">燃油费用</div>
+        <div class="right_item">{{ 0 }}</div>
         <div class="right_title">司机姓名</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
+        <div class="right_item">{{ dailyReportData.driverName }}</div>
         <div class="right_title">司机身份证号</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_title">货物类别</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_title">货名</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_title">重量(kg)</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-
-        <!-- <div class="right_title">发货联系人</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_title">发货联系人电话</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div> -->
-        <!-- <div class="right_title">距离</div>
-        <div class="right_item">约{{ orderData.compilationUnit ? orderData.compilationUnit : 0 }}km</div> -->
-        <!-- <el-divider v-if="orderData.compilationUnit"></el-divider>
-        <div v-if="orderData.compilationUnit">
-          <div class="title_name">承运信息</div>
-          <div class="right_title">承运合同编号</div>
-          <div class="right_item">{{orderData.compilationUnit}}</div>
-          <div class="right_title">委托合同编号</div>
-          <div class="right_item">{{orderData.compilationUnit}}</div>
-          <div class="right_title">车牌号</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.carNo}}</div>
-          <div class="right_title">预计运费</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.estimatedFreight}}</div>
-          <div class="right_title">装车时间</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.loadingDate}}</div>
-          <div class="right_title">装车定位</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.loadingCity}}{{orderData.hyCarrierInfo.loadingArea}}</div>
-          <div class="right_title">装车照片</div>
-          <div style="display: flex;" v-if="orderData.hyCarrierInfo.loadingImg">
-            <div v-for="(item,index) in orderData.hyCarrierInfo.loadingImg.split(',')" :key="index">
-              <img :src="item" class="img_css" @click="enlarge(item)">
-            </div>
-          </div>
-          <div class="right_title" v-if="orderData.hyCarrierInfo.totalFreight">合计应付运费</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.totalFreight}}</div>
-          <div class="right_title" v-if="orderData.hyCarrierInfo.unloadingDate">卸车时间</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.unloadingDate}}</div>
-          <div class="right_title">卸车定位</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.unloadingCity}}{{orderData.hyCarrierInfo.unloadingArea}}</div>
-          <div class="right_title" v-if="orderData.hyCarrierInfo.unloadingImg">卸车照片</div>
-          <div style="display: flex;" v-if="orderData.hyCarrierInfo.unloadingImg">
-            <div v-for="(item,index) in orderData.hyCarrierInfo.unloadingImg.split(',')" :key="index">
-              <img :src="item" class="img_css" @click="enlarge(item)">
-            </div>
-          </div>
-        </div> -->
-        <!-- <el-divider v-if="orderData.freightInfo"></el-divider>
-        <div v-if="orderData.freightInfo">
-          <div class="title_name">运费信息（单位：元）</div>
-          <div class="right_title">预付运费</div>
-          <div class="right_item">{{orderData.freightInfo.prepaidFreight}} <span
-              style="margin-left: 100px;">{{orderData.freightInfo.prepaidFreightDate}}</span></div>
-          <div class="right_title">运费尾款</div>
-          <div class="right_item">{{orderData.freightInfo.freightBalance?orderData.freightInfo.freightBalance:'未支付'}}
-            <span style="margin-left: 100px;">{{orderData.freightInfo.freightBalanceDate}}</span></div>
-          <div class="right_title" v-if="orderData.freightInfo.freightBalance">明细</div>
-          <div class="right_item" v-if="orderData.freightInfo.freightBalance">
-            预付{{orderData.freightInfo.prepaidFreight ? orderData.freightInfo.prepaidFreight : 0}}元，服务费{{orderData.freightInfo.driverServiceCharge ? orderData.freightInfo.driverServiceCharge:0}}元，尾款{{orderData.freightInfo.freightBalance ? orderData.freightInfo.freightBalance:0}}元，合计收款{{orderData.freightInfo.totalCollection ? orderData.freightInfo.totalCollection:0}}元。
-          </div>
-        </div> -->
-        <!-- <el-divider v-if="orderData.repaymentInfo"></el-divider> -->
-        <!-- <div v-if="orderData.repaymentInfo">
-          <div class="title_name">还款信息</div>
-          <div class="right_title">运费</div>
-          <div class="right_item">{{orderData.freight}}</div>
-          <div class="right_title">超期费（每天3%）</div>
-          <div class="right_item">{{orderData.repaymentInfo.overdueFee}}</div>
-          <div class="right_title">合计应还</div>
-          <div class="right_item">{{orderData.repaymentInfo.totalRepayable}}</div>
-          <div class="right_title">还款（尾号6666）</div>
-          <div class="right_item">{{orderData.repaymentInfo.alreadyRepaid}}</div>
-        </div> -->
+        <div class="right_item">{{ dailyReportData.driverIdCard }}</div>
+        <div class="right_title">收款方名称</div>
+        <div class="right_item">{{ dailyReportData.driverName }}</div>
+        <div class="right_title">收款人性别</div>
+        <div class="right_item">{{ dailyReportData.driverSex }}</div>
+        <div class="right_title">收款人生日</div>
+        <div class="right_item">{{ dailyReportData.driverBirthday }}</div>
+        <div class="right_title">收款人身份证号</div>
+        <div class="right_item">{{ dailyReportData.driverIdCard }}</div>
+        <div class="right_title">收款人电话</div>
+        <div class="right_item">{{ dailyReportData.driverPhone }}</div>
+        <div class="right_title">收款人地址</div>
+        <div class="right_item">{{ dailyReportData.driverAddress }}</div>
+        <div class="right_title">收款帐户信息</div>
+        <div class="right_item">{{ dailyReportData.driverName }}</div>
+        <div class="right_title">收款方银行代码</div>
+        <div class="right_item">{{ dailyReportData.bankKey }}</div>
+        <div class="right_title">收款方银行卡银行网点名称</div>
+        <div class="right_item">{{ dailyReportData.bankDepositBranch }}</div>
+        <div class="right_title">流水号</div>
+        <div class="right_item">{{ dailyReportData.serialNumber }}</div>
+        <div class="right_title">实际支付金额</div>
+        <div class="right_item">{{ dailyReportData.amountMoney }}</div>
+        <div class="right_title">支付凭证文件</div>
+        <div class="right_item">{{ dailyReportData.paymentVoucher }}</div>
         <div class="right_btn">
           <el-button @click="rightSee = false">关闭</el-button>
         </div>
@@ -194,16 +132,15 @@
 </template>
 <script>
 import {
-  getList,
-  seeData,
-  // toExamine,
-  // postNews,
-  // delFormData
-} from '@/api/platformManagement'
+  dailyReportGetList,
+  dailyReportDeferEscalation,
+  dailyReportBatchEscalation,
+  dailyReporGetInfo
+} from '@/api/parkReportManagement'
 export default {
   data() {
     return {
-      show : false,
+      show: false,
       tableData: [],
       // 分页
       searchkeyWord: '',
@@ -213,8 +150,8 @@ export default {
       deptCircularPage: {},
       search: '',
       modification: [],
-      orderData: {
-
+      dailyReportData: {
+        // hyFreightSettlementInfo: {}
       },
       value1: '',
       status: '',
@@ -222,39 +159,33 @@ export default {
       disabled: false,
       rejectInfo: false,
       rightSee: false,
-      form: {
-        id: '',
-        checkList: [],
-        rejectReasonDescription: ''
-      }
     }
   },
   mounted() {
     this.getList()
   },
   methods: {
-    // AddRecord() {
-    //   this.$router.push({
-    //     path: 'specifiedRecordsAdd'
-    //   })
-    // },
-
     dateChange(e) {
       this.startDate = e[0]
       this.endDate = e[1]
       this.getList()
     },
     selectInit(row) {
-        if (row.status == '审核中' || row.status == '已通过') {
-          return false
-        } 
-        else {
-          return true
-        }
+      if (row.status == '审核中' || row.status == '已通过') {
+        return false
+      }
+      else {
+        return true
+      }
     },
     handleSelectionChange(val) {
       this.modification = val;
     },
+    //上报
+    submission(row) {
+      this.modification.push(row)
+      this.batchSubmission()
+    },
     //暂缓上报
     postponeSubmission() {
       if (this.modification.length > 0) {
@@ -264,29 +195,21 @@ export default {
           type: 'warning'
         })
           .then(() => {
-            this.listLoading = true
-              // var _del = {}
-              // _del.id = row.id
-              // delFormData(_del)
+            dailyReportDeferEscalation({ hyFreightSettlementInfos: this.modification })
               .then(response => {
-                this.$notify({
-                  title: '成功',
-                  message: '操作成功！',
-                  type: 'success'
-                })
-                this.getList()
-                this.listLoading = false
-              })
-              .catch(() => {
-                this.loading = false
+                if (response.code == 200) {
+                  this.$notify({
+                    title: '成功',
+                    message: '操作成功！',
+                    type: 'success'
+                  })
+                  this.modification = []
+                  this.getList()
+                }
               })
           })
       } else {
-        this.$notify({
-          title: '操作失败',
-          message: '至少选中一条可上报的条目！',
-          type: 'error'
-        })
+        this.$message.error('至少选中一条可上报的条目！')
       }
     },
     //批量上报
@@ -298,115 +221,59 @@ export default {
           type: 'warning'
         })
           .then(() => {
-            this.listLoading = true
-              // var _del = {}
-              // _del.id = row.id
-              // delFormData(_del)
+            dailyReportBatchEscalation({ hyFreightSettlementInfos: this.modification })
               .then(response => {
-                this.$notify({
-                  title: '成功',
-                  message: '上报成功！',
-                  type: 'success'
-                })
-                this.getList()
-                this.listLoading = false
-              })
-              .catch(() => {
-                this.loading = false
+                if (response.code == 200) {
+                  this.$notify({
+                    title: '成功',
+                    message: '上报成功！',
+                    type: 'success'
+                  })
+                  this.modification = []
+                  this.getList()
+                }
               })
           })
       } else {
-        this.$notify({
-          title: '上报失败',
-          message: '至少选中一条可上报的条目！',
-          type: 'error'
-        })
+        this.$message.error('至少选中一条可上报的条目！')
       }
     },
-    //上报
-    submission() {
-      this.$confirm('确定上报运单信息？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.listLoading = true
-            // var _del = {}
-            // _del.id = row.id
-            // delFormData(_del)
-            .then(response => {
-              this.$notify({
-                title: '成功',
-                message: '上报成功！',
-                type: 'success'
-              })
-              this.getList()
-              this.listLoading = false
-            })
-            .catch(() => {
-              this.loading = false
-            })
-        })
-    },
     getList() {
-      this.loading = true
-      const _obj = {}
-      _obj.currentPage = this.currentPage
-      _obj.pageSize = this.pageSize
-      _obj.searchKeyWord = this.searchkeyWord
-      _obj.searchType = this.search
-      getList(_obj).then(response => {
-        this.tableData = response.data.records
-        this.deptBudgetTotal = response.data.total
-        // if (this.tableData[0].status == '待审核' || this.tableData[0].status == '已驳回') {
-        //   // 最上面一条处于待审核和已驳回时新增按钮置灰不可用
-        //   this.disabled = true
-        // }
-        this.listLoading = false
-      })
-        .catch(() => {
-          this.loading = false
+      this.listLoading = true;
+      let _obj = {};
+      _obj.currentPage = this.currentPage;
+      _obj.pageSize = this.pageSize;
+      _obj.searchKeyWord = this.searchkeyWord;
+      _obj.searchType = this.search;
+      _obj.startDate = this.startDate
+      _obj.endDate = this.endDate
+      dailyReportGetList(_obj)
+        .then((response) => {
+          this.tableData = response.data.records;
+          for (let i = 0; i < this.tableData.length; i++) {
+            this.tableData[i].iconShow = true;
+          }
+          this.deptBudgetTotal = response.data.total;
+          this.listLoading = false;
         })
+        .catch(() => {
+          this.listLoading = false;
+        });
     },
     searchBtn(num) {
       this.search = num;
       this.getList();
     },
-    // del(row) {
-    //   this.$confirm('确定要删除该记录吗？', '提示', {
-    //     confirmButtonText: '确定',
-    //     cancelButtonText: '取消',
-    //     type: 'warning'
-    //   })
-    //     .then(() => {
-    //       this.listLoading = true
-    //       var _del = {}
-    //       _del.id = row.id
-    //       delFormData(_del).then(response => {
-    //         this.$notify({
-    //           title: '成功',
-    //           message: '删除成功！',
-    //           type: 'success'
-    //         })
-    //         this.getList()
-    //         this.listLoading = false
-    //       })
-    //         .catch(() => {
-    //           this.loading = false
-    //         })
-    //     })
-    // },
     find() {
       this.getList()
     },
     look(row) {
       this.loading = true
-      seeData({
+      this.rightSee = true
+      dailyReporGetInfo({
         id: row.id
       }).then(response => {
-        this.orderData = response.data
-        this.rightSee = true
+        this.dailyReportData = response.data
         this.listLoading = false
       })
         .catch(() => {

src/views/parkReportManagement/waybillReporting.vue

@@ -54,20 +54,20 @@
           </template>
         </el-table-column>
         <el-table-column prop="orderNo" label="订单编号" />
-        <el-table-column prop="compilationUnit" label="发运人" />
-        <el-table-column prop="editor" label="发运人账号" />
-        <el-table-column prop="updateDate" label="承运人" />
-        <el-table-column prop="updateDate" label="承运人账号" />
-        <el-table-column prop="updateDate" label="订单完结时间" />
-        <!-- <el-table-column label="上传" prop="submitter" /> -->
-        <!-- <el-table-column prop="versionDescription" label="版本说明" /> -->
-        <el-table-column prop="status" label="状态" />
+        <el-table-column prop="cargoOwner" label="发运人" />
+        <el-table-column prop="cargoOwnerPhone" label="发运人账号" />
+        <el-table-column prop="driverName" label="承运人" />
+        <el-table-column prop="driverPhone" label="承运人账号" />
+        <el-table-column prop="orderEndDate" label="订单完结时间" />
+        <el-table-column prop="escalationStatus" label="状态" />
         <el-table-column label="操作" min-width="200">
           <template slot-scope="scope">
             <el-link target="_blank" @click="look(scope.row)" type="primary" :underline="false">查看</el-link>
             <el-divider direction="vertical" />
             <el-link target="_blank" type="primary" :underline="false" @click="submission(scope.row)"
-              v-if="scope.row.search == 1 || scope.row.search == 4 || scope.row.status == '暂缓中'">上报</el-link>
+              :disabled="scope.row.escalationStatus != '未上报' && scope.row.escalationStatus != '未通过' && scope.row.escalationStatus != '暂缓中'">
+              上报</el-link>
+
           </template>
         </el-table-column>
       </el-table>
@@ -78,114 +78,53 @@
 
     <el-drawer title="运单信息" :visible.sync="rightSee" style="overflow-y: auto !important">
       <div class="right_css">
-        <div class="right_item">订单编号：{{ orderData.compilationUnit }}</div>
+        <div class="right_item">订单编号：{{ orderData.orderNo }}</div>
         <div class="right_title">发货时间</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_title">收货时间</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
+        <div class="right_item">{{ orderData.hyCarrierInfo.loadingDate }}</div>
+        <div class="right_title" v-if="orderData.hyCarrierInfo.unloadingDate">收货时间</div>
+        <div class="right_item">{{ orderData.hyCarrierInfo.unloadingDate }}</div>
         <div class="right_title">托运方</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
+        <div class="right_item">{{ orderData.cargoOwner ? orderData.cargoOwner : orderData.compName }}</div>
         <div class="right_title">托运方证件号或信用代码</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_title">收货方</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
+        <div class="right_item" v-if="orderData.cargoOwnerIdCard">{{ orderData.cargoOwnerIdCard }}</div>
+        <div class="right_item" v-else>{{ orderData.hyCompanyInfo ? orderData.hyCompanyInfo.unifiedSocialCreditCode :
+            "暂无"
+        }}
+        </div>
+        <div class="right_title">收货联系人</div>
+        <div class="right_item">{{ orderData.publishTaskInfo.receiver }}</div>
         <div class="right_title">收货方证件号或信用代码</div>
+        <div class="right_item">{{ orderData.publishTaskInfo.receiverIdcard ? orderData.publishTaskInfo.receiverIdcard :
+            orderData.publishTaskInfo.receiverCreditCode
+        }}</div>
         <div class="right_title">运费</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
+        <div class="right_item">{{ orderData.freight }}</div>
         <div class="right_title">车牌号</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
+        <div class="right_item">{{ orderData.carNumber }}</div>
         <div class="right_title">车牌颜色</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
+        <div class="right_item">{{ orderData.carNumberColour }}</div>
         <div class="right_title">发货地址</div>
         <div class="right_item">
-          {{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{
-              orderData.compilationUnit
+          {{ orderData.sendPrivate }}{{ orderData.sendCity }}{{ orderData.sendArea }}{{
+              orderData.sendDetailedAddress
           }}
         </div>
         <div class="right_title">收货地址</div>
         <div class="right_item">
-          {{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{
-              orderData.compilationUnit
+          {{ orderData.unloadPrivate }}{{ orderData.unloadCity }}{{ orderData.unloadArea }}{{
+              orderData.unloadDetailedAddress
           }}
         </div>
         <div class="right_title">司机姓名</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
+        <div class="right_item">{{ orderData.driverName }}</div>
         <div class="right_title">司机身份证号</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
+        <div class="right_item">{{ orderData.driverIdCard }}</div>
         <div class="right_title">货物类别</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
+        <div class="right_item">{{ orderData.goodsType }}</div>
         <div class="right_title">货名</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
+        <div class="right_item">{{ orderData.goodsName }}</div>
         <div class="right_title">重量(kg)</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-
-        <!-- <div class="right_title">发货联系人</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div>
-        <div class="right_title">发货联系人电话</div>
-        <div class="right_item">{{ orderData.compilationUnit }}</div> -->
-        <!-- <div class="right_title">距离</div>
-        <div class="right_item">约{{ orderData.compilationUnit ? orderData.compilationUnit : 0 }}km</div> -->
-        <!-- <el-divider v-if="orderData.compilationUnit"></el-divider>
-        <div v-if="orderData.compilationUnit">
-          <div class="title_name">承运信息</div>
-          <div class="right_title">承运合同编号</div>
-          <div class="right_item">{{orderData.compilationUnit}}</div>
-          <div class="right_title">委托合同编号</div>
-          <div class="right_item">{{orderData.compilationUnit}}</div>
-          <div class="right_title">车牌号</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.carNo}}</div>
-          <div class="right_title">预计运费</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.estimatedFreight}}</div>
-          <div class="right_title">装车时间</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.loadingDate}}</div>
-          <div class="right_title">装车定位</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.loadingCity}}{{orderData.hyCarrierInfo.loadingArea}}</div>
-          <div class="right_title">装车照片</div>
-          <div style="display: flex;" v-if="orderData.hyCarrierInfo.loadingImg">
-            <div v-for="(item,index) in orderData.hyCarrierInfo.loadingImg.split(',')" :key="index">
-              <img :src="item" class="img_css" @click="enlarge(item)">
-            </div>
-          </div>
-          <div class="right_title" v-if="orderData.hyCarrierInfo.totalFreight">合计应付运费</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.totalFreight}}</div>
-          <div class="right_title" v-if="orderData.hyCarrierInfo.unloadingDate">卸车时间</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.unloadingDate}}</div>
-          <div class="right_title">卸车定位</div>
-          <div class="right_item">{{orderData.hyCarrierInfo.unloadingCity}}{{orderData.hyCarrierInfo.unloadingArea}}</div>
-          <div class="right_title" v-if="orderData.hyCarrierInfo.unloadingImg">卸车照片</div>
-          <div style="display: flex;" v-if="orderData.hyCarrierInfo.unloadingImg">
-            <div v-for="(item,index) in orderData.hyCarrierInfo.unloadingImg.split(',')" :key="index">
-              <img :src="item" class="img_css" @click="enlarge(item)">
-            </div>
-          </div>
-        </div> -->
-        <!-- <el-divider v-if="orderData.freightInfo"></el-divider>
-        <div v-if="orderData.freightInfo">
-          <div class="title_name">运费信息（单位：元）</div>
-          <div class="right_title">预付运费</div>
-          <div class="right_item">{{orderData.freightInfo.prepaidFreight}} <span
-              style="margin-left: 100px;">{{orderData.freightInfo.prepaidFreightDate}}</span></div>
-          <div class="right_title">运费尾款</div>
-          <div class="right_item">{{orderData.freightInfo.freightBalance?orderData.freightInfo.freightBalance:'未支付'}}
-            <span style="margin-left: 100px;">{{orderData.freightInfo.freightBalanceDate}}</span></div>
-          <div class="right_title" v-if="orderData.freightInfo.freightBalance">明细</div>
-          <div class="right_item" v-if="orderData.freightInfo.freightBalance">
-            预付{{orderData.freightInfo.prepaidFreight ? orderData.freightInfo.prepaidFreight : 0}}元，服务费{{orderData.freightInfo.driverServiceCharge ? orderData.freightInfo.driverServiceCharge:0}}元，尾款{{orderData.freightInfo.freightBalance ? orderData.freightInfo.freightBalance:0}}元，合计收款{{orderData.freightInfo.totalCollection ? orderData.freightInfo.totalCollection:0}}元。
-          </div>
-        </div> -->
-        <!-- <el-divider v-if="orderData.repaymentInfo"></el-divider> -->
-        <!-- <div v-if="orderData.repaymentInfo">
-          <div class="title_name">还款信息</div>
-          <div class="right_title">运费</div>
-          <div class="right_item">{{orderData.freight}}</div>
-          <div class="right_title">超期费（每天3%）</div>
-          <div class="right_item">{{orderData.repaymentInfo.overdueFee}}</div>
-          <div class="right_title">合计应还</div>
-          <div class="right_item">{{orderData.repaymentInfo.totalRepayable}}</div>
-          <div class="right_title">还款（尾号6666）</div>
-          <div class="right_item">{{orderData.repaymentInfo.alreadyRepaid}}</div>
-        </div> -->
+        <div class="right_item">{{ orderData.publishTaskInfo.weight }}</div>
         <div class="right_btn">
           <el-button @click="rightSee = false">关闭</el-button>
         </div>
@@ -195,12 +134,11 @@
 </template>
 <script>
 import {
-  getList,
-  seeData,
-  // toExamine,
-  // postNews,
-  // delFormData
-} from '@/api/platformManagement'
+  waybillGetList,
+  waybillGetInfo,
+  deferEscalation,
+  batchEscalation
+} from '@/api/parkReportManagement'
 export default {
   data() {
     return {
@@ -214,30 +152,26 @@ export default {
       search: '',
       modification: [],
       orderData: {
-
+        publishTaskInfo: {},
+        hyCarrierInfo: {},
+        hyCargoOwnerInfo: {},
+        hyCompanyInfo: {}
       },
       value1: '',
       status: '',
-      addressUrl: [],
       disabled: false,
       rejectInfo: false,
+      //侧边查看
       rightSee: false,
-      form: {
-        id: '',
-        checkList: [],
-        rejectReasonDescription: ''
-      }
+      //筛选时间
+      startDate: '',
+      endDate: '',
     }
   },
   mounted() {
     this.getList()
   },
   methods: {
-    // AddRecord() {
-    //   this.$router.push({
-    //     path: 'specifiedRecordsAdd'
-    //   })
-    // },
     handleSelectionChange(val) {
       this.modification = val;
     },
@@ -246,6 +180,11 @@ export default {
       this.endDate = e[1]
       this.getList()
     },
+    //上报
+    submission(row) {
+      this.modification.push(row)
+      this.batchSubmission()
+    },
     //暂缓上报
     postponeSubmission() {
       if (this.modification.length > 0) {
@@ -255,29 +194,21 @@ export default {
           type: 'warning'
         })
           .then(() => {
-            this.listLoading = true
-              // var _del = {}
-              // _del.id = row.id
-              // delFormData(_del)
+            deferEscalation({ orderInfoList: this.modification })
               .then(response => {
-                this.$notify({
-                  title: '成功',
-                  message: '操作成功！',
-                  type: 'success'
-                })
-                this.getList()
-                this.listLoading = false
-              })
-              .catch(() => {
-                this.loading = false
+                if (response.code == 200) {
+                  this.$notify({
+                    title: '成功',
+                    message: '操作成功！',
+                    type: 'success'
+                  })
+                  this.modification = []
+                  this.getList()
+                }
               })
           })
       } else {
-        this.$notify({
-          title: '失败',
-          message: '至少选中一条可上报的条目！',
-          type: 'error'
-        })
+        this.$message.error('至少选中一条可上报的条目！')
       }
     },
     //批量上报
@@ -289,79 +220,51 @@ export default {
           type: 'warning'
         })
           .then(() => {
-            this.listLoading = true
-              // var _del = {}
-              // _del.id = row.id
-              // delFormData(_del)
+            batchEscalation({ orderInfoList: this.modification })
               .then(response => {
-                this.$notify({
-                  title: '成功',
-                  message: '上报成功！',
-                  type: 'success'
-                })
-                this.getList()
-                this.listLoading = false
-              })
-              .catch(() => {
-                this.loading = false
+                if (response.code == 200) {
+                  this.$notify({
+                    title: '成功',
+                    message: '上报成功！',
+                    type: 'success'
+                  })
+                  this.modification = []
+                  this.getList()
+                }
               })
           })
       } else {
-        this.$notify({
-          title: '上报失败',
-          message: '至少选中一条可上报的条目！',
-          type: 'error'
-        })
+        this.$message.error('至少选中一条可上报的条目！')
       }
     },
-    //上报
-    submission() {
-      this.$confirm('确定上报运单信息？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.listLoading = true
-            // var _del = {}
-            // _del.id = row.id
-            // delFormData(_del)
-            .then(response => {
-              this.$notify({
-                title: '成功',
-                message: '上报成功！',
-                type: 'success'
-              })
-              this.getList()
-              this.listLoading = false
-            })
-            .catch(() => {
-              this.loading = false
-            })
-        })
-    },
     selectInit(row) {
-       if (row.status == '审核中' || row.status == '已通过') {
-          return false
-        } else {
-          return true
-        }
+      if (row.status == '审核中' || row.status == '已通过') {
+        return false
+      } else {
+        return true
+      }
     },
     getList() {
-      this.loading = true
-      const _obj = {}
-      _obj.currentPage = this.currentPage
-      _obj.pageSize = this.pageSize
-      _obj.searchKeyWord = this.searchkeyWord
-      _obj.searchType = this.search
-      getList(_obj).then(response => {
-        this.tableData = response.data.records
-        this.deptBudgetTotal = response.data.total
-        this.listLoading = false
-      })
-        .catch(() => {
-          this.loading = false
+      this.listLoading = true;
+      let _obj = {};
+      _obj.currentPage = this.currentPage;
+      _obj.pageSize = this.pageSize;
+      _obj.searchKeyWord = this.searchkeyWord;
+      _obj.searchType = this.search;
+      _obj.startDate = this.startDate
+      _obj.endDate = this.endDate
+      waybillGetList(_obj)
+        .then((response) => {
+          this.tableData = response.data.records;
+          for (let i = 0; i < this.tableData.length; i++) {
+            this.tableData[i].iconShow = true;
+          }
+          this.deptBudgetTotal = response.data.total;
+          this.listLoading = false;
         })
+        .catch(() => {
+          this.listLoading = false;
+        });
     },
     searchBtn(num) {
       this.search = num;
@@ -372,11 +275,11 @@ export default {
     },
     look(row) {
       this.loading = true
-      seeData({
+      this.rightSee = true
+      waybillGetInfo({
         id: row.id
       }).then(response => {
         this.orderData = response.data
-        this.rightSee = true
         this.listLoading = false
       })
         .catch(() => {