From 1afb0871f431385797fe63ab489af44b9c15c2c4 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 29 Oct 2024 17:23:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/VehicleArrivalManagement.js  | 14 ++---
 src/option/distribution/VehicleStowage.js     | 12 ++--
 .../distribution/inventory/BookingNote.vue    | 56 +++++++++++++++++--
 .../distribution/inventory/CreateOrder.vue    |  1 +
 src/views/waybill/CreateZeroOrder.vue         |  1 +
 5 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/src/option/distribution/VehicleArrivalManagement.js b/src/option/distribution/VehicleArrivalManagement.js
index d6c824a8..e81ac865 100644
--- a/src/option/distribution/VehicleArrivalManagement.js
+++ b/src/option/distribution/VehicleArrivalManagement.js
@@ -40,7 +40,7 @@ export const columnList = [
     label: '计划装车',
     type: 1,
     values: '',
-    width: '130',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -51,7 +51,7 @@ export const columnList = [
     label: '装车件数',
     type: 1,
     values: '',
-    width: '130',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -62,7 +62,7 @@ export const columnList = [
     label: '在车件数',
     type: 1,
     values: '',
-    width: '130',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -73,7 +73,7 @@ export const columnList = [
     label: '卸车件数',
     type: 1,
     values: '',
-    width: '180',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -84,7 +84,7 @@ export const columnList = [
     label: '满载率',
     type: 1,
     values: '',
-    width: '130',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -239,7 +239,7 @@ export const columnList = [
     label: '油费',
     type: 1,
     values: '',
-    width: '130',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -250,7 +250,7 @@ export const columnList = [
     label: '路桥费',
     type: 1,
     values: '',
-    width: '130',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/VehicleStowage.js b/src/option/distribution/VehicleStowage.js
index 1db42ef8..4aa909a2 100644
--- a/src/option/distribution/VehicleStowage.js
+++ b/src/option/distribution/VehicleStowage.js
@@ -40,7 +40,7 @@ export const columnList = [
     label: '计划装车',
     type: 1,
     values: '',
-    width: '130',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -51,7 +51,7 @@ export const columnList = [
     label: '装车件数',
     type: 1,
     values: '',
-    width: '130',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -62,7 +62,7 @@ export const columnList = [
     label: '在车件数',
     type: 1,
     values: '',
-    width: '130',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -73,7 +73,7 @@ export const columnList = [
     label: '卸车件数',
     type: 1,
     values: '',
-    width: '180',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -84,7 +84,7 @@ export const columnList = [
     label: '满载率',
     type: 1,
     values: '',
-    width: '130',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -250,7 +250,7 @@ export const columnList = [
     label: '路桥费',
     type: 1,
     values: '',
-    width: '130',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue
index 000dd1e3..f82943d7 100644
--- a/src/views/distribution/inventory/BookingNote.vue
+++ b/src/views/distribution/inventory/BookingNote.vue
@@ -901,23 +901,40 @@
 
           <!-- 提交按钮 -->
           <div class="submitDataContainer">
+            <!-- 取消审核 -->
             <el-button
               type="primary"
-              v-if="BookingNote_audit && !query.checkUserId"
+              v-if="BookingNote_audit && Number(query.checkStatus) === 1"
+              icon="CircleClose"
+              @click="handleCloseAudit"
+            >
+              取消审核
+            </el-button>
+
+            <!-- 审核 -->
+            <el-button
+              type="primary"
+              v-if="BookingNote_audit && Number(query.checkStatus) === 0"
               icon="el-icon-position"
               @click="handleShowAudit"
             >
               审 核
             </el-button>
+
+            <!-- 修改 -->
             <el-button
               type="primary"
               v-if="BookingNote_edit && Number(query.checkStatus) === 0"
               icon="el-icon-edit"
               @click="handleEdit"
             >
-              修 改</el-button
-            >
+              修 改
+            </el-button>
+
+            <!-- 打印 -->
             <el-button type="primary" icon="el-icon-printer" @click="handlePrint"> 打 印</el-button>
+
+            <!-- 关闭 -->
             <el-button type="primary" icon="el-icon-close" @click="back()"> 关 闭</el-button>
           </div>
 
@@ -1086,7 +1103,11 @@ import {
   TransactionColumnList,
 } from '@/option/distribution/BookingNote';
 import { useRouter, useRoute } from 'vue-router';
-import { postFindWaybillDetail, postCheckWaybill } from '@/api/distribution/CreateOrder.js';
+import {
+  postFindWaybillDetail,
+  postCheckWaybill,
+  postCancleCheckWaybill,
+} from '@/api/distribution/CreateOrder.js';
 import { postPrintBatch } from '@/api/waybill/WaybillOrderList.js';
 import { getLazyTreeAll } from '@/api/base/region';
 import {
@@ -1805,6 +1826,33 @@ const handleAudit = async () => {
   }
 };
 
+/** 取消审核 */
+const handleCloseAudit = ({ row }) => {
+  ElMessageBox.confirm('是否确认取消审核?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    details.loadingObj.pageLoading = true;
+    try {
+      const res = await postCancleCheckWaybill({
+        waybillId: $route.query.id,
+      });
+
+      const { code, msg } = res.data;
+      if (code !== 200) return;
+      ElMessage.success({
+        message: msg,
+      });
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
+
 /** 请求运输合同图片列表 */
 const handleFindContractList = async () => {
   try {
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 9f5aad81..49faebed 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -2868,6 +2868,7 @@ const handleChooseConsigner = (column, prop, order) => {
 
   // 送货方式
   if (column.defaultDeliveryWay) details.query.deliveryWay = column.defaultDeliveryWay;
+  if (column.defaultPayWay) details.query.payWay = column.defaultPayWay + '';
 
   // 到站
   const _destination = [];
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 1530f009..51046564 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -2195,6 +2195,7 @@ const handleChooseConsigner = (column, prop, order) => {
 
   // 送货方式
   if (column.defaultDeliveryWay) details.query.deliveryWay = column.defaultDeliveryWay;
+  if (column.defaultPayWay) details.query.payWay = column.defaultPayWay + '';
 
   // 到站
   const _destination = [];