Merge branch 'dev' into pre-production

src/api/distribution/addTripartiteTransfer.js

@@ -67,7 +67,7 @@ export const postSaveNewTripartiteTransfer = data => {
 };
 
 /**
- * 新增配载计划
+ * 编辑配载计划
  */
 export const postUpdateTripartiteTransfer = data => {
   return request({

src/api/storagecost/index.js

@@ -1,4 +1,5 @@
 import request from '@/axios';
+import { p } from '@antfu/utils';
 // 月度仓储成本统计表接口
 export const $_Getlist = params => {
   return request({
@@ -142,6 +143,30 @@ export const $_Traincostbreakdown = params => {
     params,
   });
 };
+// 配送成本-车辆成本结算表异动调整
+export const $_Traincostbreakdownchange = data => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchTrainDetail/change',
+    method: 'post',
+    data,
+  });
+};
+// 配送成本-车辆成本结算表结算
+export const $_Traincostbreakdownsubmit = data => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchTrainDetail/submit',
+    method: 'post',
+    data,
+  });
+};
+// 配送成本-车辆成本结算表结算-异动记录
+export const $_Traincostbreakdownsubmitpage = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchTrainDetailChange/page',
+    method: 'get',
+    params,
+  });
+};
 // 配送-车次成本明细-导出
 export const $_expenseDispatchTrainDetail = params => {
   return request({
@@ -404,3 +429,4 @@ export const $_Warehouserentalmanagementremove = params => {
     params,
   });
 };
+

src/option/finance/WaybillAudit.js

@@ -58,16 +58,16 @@ export const columnList = [
     sortable: true,
     head: false,
   },
-  {
+  // {
-    prop: 'consigneeCode',
+  //   prop: 'consigneeCode',
-    label: '收货单位编码',
+  //   label: '收货单位编码',
-    type: 2,
+  //   type: 2,
-    values: '',
+  //   values: '',
-    width: '130',
+  //   width: '130',
-    checkarr: [],
+  //   checkarr: [],
-    fixed: false,
+  //   fixed: false,
-    sortable: true,
+  //   sortable: true,
-  },
+  // },
   {
     prop: 'consignee',
     label: '收货单位',
@@ -580,6 +580,16 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'completeDestination',
+    label: '到站全称',
+    type: 2,
+    values: '',
+    width: '120',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'destinationWarehouseName',
     label: '目的仓',
@@ -763,6 +773,65 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+
+  {
+    prop: 'signCount',
+    label: '签收件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'deliveryTime',
+    label: '配送时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'signTime',
+    label: "签收时间",
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'signUserName',
+    label: "签收人",
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'deliveryDriverName',
+    label: "配送司机",
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
   // {
   //   prop: 'templateType',
   //   label: '是否售后',

src/option/storagecost/Traincostbreakdown.js

@@ -15,9 +15,9 @@ export const columnList = [
     fixed: true,
   },
   {
-    prop: 'trainNumber',
+    prop: 'deliveryVehicle',
-    label: '车次号',
+    label: '配送车辆',
-    type: 2,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -26,8 +26,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'deliveryDate',
+    prop: 'distributionModel',
-    label: '配送日期',
+    label: '配送车型',
     type: 1,
     values: '',
     width: '150',
@@ -37,8 +37,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'destinationWarehouse',
+    prop: 'trainNumber',
-    label: '目的仓',
+    label: '车次号',
     type: 1,
     values: '',
     width: '150',
@@ -48,9 +48,9 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'customerName',
+    prop: 'settlementStatus',
-    label: '客户名称',
+    label: '结算状态',
-    type: 3,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -59,8 +59,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'orderCode',
+    prop: 'deliveryDate',
-    label: '订单自编号',
+    label: '配送日期',
     type: 1,
     values: '',
     width: '200',
@@ -69,29 +69,42 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'destinationWarehouse',
+    label: '目的仓',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'distributionType',
     label: '配送类型',
     type: 1,
     values: '',
     width: '150',
-    checkarr: [
+    checkarr: [],
-      {
+    fixed: false,
-        label: '商配',
+    sortable: true,
-        value: '商配',
+    head: false,
   },
   {
-        label: '市配',
+    prop: 'carrierName',
-        value: '市配',
+    label: '承运方名称',
-      },
+    type: 1,
-    ],
+    values: '',
+    width: '150',
+    checkarr: [],
     fixed: false,
     sortable: true,
     head: false,
   },
   {
-    prop: 'deliveryVehicle',
+    prop: 'plannedTotalQuantity',
-    label: '配送车辆',
+    label: '计划总件数',
     type: 1,
     values: '',
     width: '150',
@@ -99,10 +112,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'distributionModel',
+    prop: 'totalOrderQuantity',
-    label: '配送车型',
+    label: '订单总数',
     type: 1,
     values: '',
     width: '150',
@@ -110,10 +124,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'carrierName',
+    prop: 'inventoryItemCount',
-    label: '承运方名称',
+    label: '库存品件数',
     type: 1,
     values: '',
     width: '150',
@@ -121,10 +136,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'carrierType',
+    prop: 'totalLoadedPieces',
-    label: '承运方类型',
+    label: '装车总件数',
     type: 1,
     values: '',
     width: '150',
@@ -132,10 +148,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'deliveryDriver',
+    prop: 'totalReceiptCost',
-    label: '配送司机',
+    label: '签收总件数',
     type: 1,
     values: '',
     width: '150',
@@ -143,10 +160,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'plannedTotalQuantity',
+    prop: 'totalDistributionCost',
-    label: '计划总件数',
+    label: '配送总成本',
     type: 1,
     values: '',
     width: '150',
@@ -154,10 +172,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'totalOrderQuantity',
+    prop: 'distributionCost',
-    label: '订单总数',
+    label: '配送成本',
     type: 1,
     values: '',
     width: '150',
@@ -165,10 +184,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'inventoryItemCount',
+    prop: 'stairCarryingFee',
-    label: '库存品件数',
+    label: '上楼费成本',
     type: 1,
     values: '',
     width: '150',
@@ -176,10 +196,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'totalLoadedPieces',
+    prop: 'goodsAllocationCost',
-    label: '装车总件数',
+    label: '分货费成本',
     type: 1,
     values: '',
     width: '150',
@@ -187,10 +208,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'totalReceiptCost',
+    prop: 'repositioningCost',
-    label: '签收总件数',
+    label: '平移费成本',
     type: 1,
     values: '',
     width: '150',
@@ -198,10 +220,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'totalDistributionCost',
+    prop: 'handlingCost',
-    label: '配送总成本',
+    label: '装卸费成本',
     type: 1,
     values: '',
     width: '150',
@@ -209,10 +232,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'distributionCost',
+    prop: 'mileageCost',
-    label: '配送成本',
+    label: '公里数成本',
     type: 1,
     values: '',
     width: '150',
@@ -220,10 +244,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'inventoryDistributionCost',
+    prop: 'subsidizedKilometerCost',
-    label: '库存品配送成本',
+    label: '补贴公里数成本',
     type: 1,
     values: '',
     width: '150',
@@ -231,10 +256,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'tagRemovalCost',
+    prop: 'excessZoneMileageCost',
-    label: '撕标签成本',
+    label: '超区公里费成本',
     type: 1,
     values: '',
     width: '150',
@@ -242,10 +268,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'stairCarryingFee',
+    prop: 'locationSubsidyCost',
-    label: '上楼费成本',
+    label: '点位补贴费成本',
     type: 1,
     values: '',
     width: '150',
@@ -253,10 +280,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'goodsAllocationCost',
+    prop: 'minimumGuaranteeCost',
-    label: '分货费成本',
+    label: '保底费成本',
     type: 1,
     values: '',
     width: '150',
@@ -264,10 +292,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'repositioningCost',
+    prop: 'fuelCost',
-    label: '平移费成本',
+    label: '油费成本',
     type: 1,
     values: '',
     width: '150',
@@ -275,10 +304,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'handlingCost',
+    prop: 'otherCosts',
-    label: '装卸费成本',
+    label: '其他成本',
     type: 1,
     values: '',
     width: '150',
@@ -286,10 +316,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'mileageCost',
+    prop: 'changeAmount',
-    label: '公里数成本',
+    label: '异动金额',
     type: 1,
     values: '',
     width: '150',
@@ -297,10 +328,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'subsidizedKilometerCost',
+    prop: 'changeTime',
-    label: '补贴公里数成本',
+    label: '异动时间',
     type: 1,
     values: '',
     width: '150',
@@ -310,8 +342,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'excessZoneMileageCost',
+    prop: 'changeOperator',
-    label: '超区公里费成本',
+    label: '异动操作人',
     type: 1,
     values: '',
     width: '150',
@@ -321,8 +353,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'locationSubsidyCost',
+    prop: 'settlementAmount',
-    label: '点位补贴费成本',
+    label: '结算金额',
     type: 1,
     values: '',
     width: '150',
@@ -330,10 +362,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true,
   },
   {
-    prop: 'minimumGuaranteeCost',
+    prop: 'settlementTime',
-    label: '保底费成本',
+    label: '结算时间',
     type: 1,
     values: '',
     width: '150',
@@ -343,8 +376,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'fuelCost',
+    prop: 'settlementNote',
-    label: '油费成本',
+    label: '结算备注',
     type: 1,
     values: '',
     width: '150',
@@ -354,8 +387,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'otherCosts',
+    prop: 'settlementUser',
-    label: '其他成本',
+    label: '结算人',
     type: 1,
     values: '',
     width: '150',
@@ -364,7 +397,6 @@ export const columnList = [
     sortable: true,
     head: false,
   },
-
   {
     prop: 'createUserName',
     label: '操作',
@@ -376,3 +408,65 @@ export const columnList = [
     sortable: false,
   },
 ];
+export const AbnormalrecordcolumnList = [
+  {
+    prop: 'checkbox',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'xh',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'changeAmount',
+    label: '异动金额',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'changeNote',
+    label: '异动备注',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'changeOperator',
+    label: '操作人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'changeTime',
+    label: '异动操作时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+];

src/option/waybill/WaybillOrderList.js

@@ -60,7 +60,7 @@ export const columnList = [
     label: '运单状态',
     type: 3,
     values: '',
-    width: '100',
+    width: '120',
     checkarr: [
       { label: '未入库', value: '0' },
       { label: '部分入库', value: '10' },
@@ -198,6 +198,16 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
+  {
+    prop: 'completeDestination',
+    label: '到站全称',
+    type: 2,
+    values: '',
+    width: '120',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'goodsName',
     label: '货物名称',

src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue

@@ -19,9 +19,9 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" @click="exportExcel"
+            <!-- <el-button type="primary" @click="exportExcel"
               ><el-icon><Plus /></el-icon>导出</el-button
-            >
+            > -->
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -49,9 +49,21 @@
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
               <div class="ElBtnClass">
-                <el-text type="primary">异动调整</el-text>
+                <el-text
-                <el-text type="primary">异动记录</el-text>
+                  type="primary"
-                <el-text type="primary">结算</el-text>
+                  v-if="slotProps.scope.row.settlementStatus == '未结算'"
+                  @click="AbnormaladjustmentClick(slotProps.scope.row)"
+                  >异动调整</el-text
+                >
+                <el-text type="primary" @click="Abnormalrecord(slotProps.scope.row)"
+                  >异动记录</el-text
+                >
+                <el-text
+                  type="primary"
+                  v-if="slotProps.scope.row.settlementStatus == '未结算'"
+                  @click="confirmation(slotProps.scope.row)"
+                  >结算</el-text
+                >
               </div>
             </template>
           </template>
@@ -77,6 +89,120 @@
         </div>
       </el-row>
     </div>
+    <!-- 异动调整 -->
+
+    <el-dialog
+      v-model="Abnormaladjustment.dialogVisible"
+      title="异动调整"
+      width="500"
+      :before-close="handleClose"
+    >
+      <div v-loading="Abnormaladjustment.loading" element-loading-text="Loading...">
+        <el-form :model="Abnormaladjustment.form" label-width="auto" style="max-width: 600px">
+          <el-form-item label="异动费用:">
+            <el-input-number
+              v-model="Abnormaladjustment.form.changeAmount"
+              :min="0"
+              :controls="false"
+              :value-on-clear="0"
+            />
+          </el-form-item>
+          <el-form-item label="异动费用备注:">
+            <el-input
+              v-model="Abnormaladjustment.form.changeNote"
+              style="width: 100%"
+              :rows="2"
+              type="textarea"
+              placeholder="请填写异动费用备注(必填)"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="Abnormaladjustment.dialogVisible = false">关闭</el-button>
+          <el-button
+            type="primary"
+            @click="AbnormaladjustmentSubmit"
+            :disabled="Abnormaladjustment.loading"
+          >
+            提交
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 异动确认结算 -->
+    <el-dialog v-model="Confirmsettlement.dialogVisible" title="确认结算" width="500">
+      <div v-loading="Confirmsettlement.loading" element-loading-text="Loading...">
+        <el-form :model="Confirmsettlement.form" label-width="auto" style="max-width: 600px">
+          <el-form-item label="结算备注:">
+            <el-input
+              v-model="Confirmsettlement.form.settlementNote"
+              style="width: 100%"
+              :rows="4"
+              type="textarea"
+              placeholder="请填写结算备注(必填)"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="Confirmsettlement.dialogVisible = false">关闭</el-button>
+          <el-button
+            type="primary"
+            @click="SettlementconfirmationSubmit"
+            :disabled="Confirmsettlement.loading"
+          >
+            提交
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <!-- 异动记录 -->
+    <el-dialog v-model="viewAbnormalrecord.dialogVisible" title="异动记录" width="50%">
+      <!-- 控件模块 -->
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left"></div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChangeSyd" circle></el-button>
+            <!-- <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+            <el-button icon="Search" @click="searchHide" circle></el-button> -->
+          </div>
+        </div>
+      </el-row>
+      <el-row>
+        <tablecmt
+          class="viewAbnormalrecord"
+          :columnList="details.AbnormalrecordcolumnList"
+          :tableData="Abnormalrecordcdata"
+          :loading="viewAbnormalrecord.list"
+        >
+        </tablecmt>
+      </el-row>
+      <!-- 分页模块 -->
+      <el-row class="el-fy">
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div></div>
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChangeyd"
+            @current-change="currentChangeyd"
+            :current-page="pageyd.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="pageyd.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="pageyd.total"
+          >
+          </el-pagination>
+        </div>
+      </el-row>
+    </el-dialog>
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
@@ -89,10 +215,17 @@
 
 <script setup>
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
-import { columnList } from '@/option/storagecost/Traincostbreakdown.js';
+import { columnList, AbnormalrecordcolumnList } from '@/option/storagecost/Traincostbreakdown.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { processRowProperty, setNodeHeight } from '@/utils/util';
-import { $_getMyWarehouseList,$_Traincostbreakdown ,$_expenseDispatchTrainDetail} from '@/api/storagecost/index.js';
+import {
+  $_getMyWarehouseList,
+  $_Traincostbreakdown,
+  $_expenseDispatchTrainDetail,
+  $_Traincostbreakdownchange,
+  $_Traincostbreakdownsubmit,
+  $_Traincostbreakdownsubmitpage,
+} from '@/api/storagecost/index.js';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls } from '@/utils/util';
 import { useStore } from 'vuex';
@@ -100,6 +233,26 @@ import dayjs from 'dayjs';
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
+// 异动跳转
+const Abnormaladjustment = ref({
+  dialogVisible: false,
+  loading: false,
+  form: {
+    changeAmount: 0,
+    changeNote: '',
+  },
+});
+const Confirmsettlement = ref({
+  dialogVisible: false,
+  loading: false,
+  form: {
+    settlementNote: '',
+  },
+});
+const viewAbnormalrecord = ref({
+  dialogVisible: false,
+  list: false,
+});
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -137,9 +290,10 @@ const details = reactive({
   ],
   /** 列表 */
   columnList,
-
+  AbnormalrecordcolumnList,
   /** 列表数据 */
   data: [],
+  Abnormalrecordcdata: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -156,7 +310,11 @@ const details = reactive({
     pageSize: 50,
     total: 0,
   },
-
+  pageyd: {
+    currentPage: 1,
+    pageSize: 50,
+    total: 0,
+  },
   /** 弹出层显示 */
   popUpShow: {
     /** 包件明细 */
@@ -181,10 +339,12 @@ const {
   query,
   shortcuts,
   data,
+  Abnormalrecordcdata,
   loadingObj,
   selectionList,
   drawerShow,
   page,
+  pageyd,
   trickleLoadingPage,
   zeroAdditionalRecordingInfo,
   popUpShow,
@@ -237,14 +397,23 @@ const sizeChange = val => {
   details.page.pageSize = val;
   onLoad();
 };
+// 每页多少条
+const sizeChangeyd = val => {
+  details.pageyd.pageSize = val;
+  onLoad();
+};
 /** 页码改变执行的回调 */
 const currentChange = val => {
   details.page.currentPage = val;
   onLoad();
 };
+const currentChangeyd = val => {
+  details.pageyd.currentPage = val;
+  onLoad();
+};
 // 刷新按钮
 const searchChangeS = () => {
-  details.search = false; //关闭搜索
+  onLoad();
 };
 // 顶部搜索
 const searchHide = () => {
@@ -274,15 +443,18 @@ const onLoad = value => {
     ...value,
   };
   details.loadingObj.list = true;
-  $_Traincostbreakdown(data).then(res => {
+  $_Traincostbreakdown(data)
+    .then(res => {
       console.log(res, '初始化数据');
       if (res.data.code == 200) {
         details.data = res.data.data.records || [];
         details.page.total = res.data.data.total; //页码
       }
-  }).catch((error)=>{
+    })
+    .catch(error => {
       console.log(error);
-  }).finally(()=>{
+    })
+    .finally(() => {
       details.loadingObj.list = false;
     });
 };
@@ -318,6 +490,116 @@ const exportExcel = () => {
     })
     .catch(() => {});
 };
+// 异动调整
+const AbnormaladjustmentClick = row => {
+  const { id, changeAmount, changeNote } = row;
+  Abnormaladjustment.value.dialogVisible = true;
+  Abnormaladjustment.value.form = { id, changeAmount, changeNote };
+};
+// 异动调整提交
+const AbnormaladjustmentSubmit = async () => {
+  if (!Abnormaladjustment.value.form.changeNote) {
+    ElMessage({
+      message: '请填写异动备注',
+      type: 'warning',
+    });
+    return;
+  }
+  try {
+    Abnormaladjustment.value.loading = true;
+    let Submit = {
+      ...Abnormaladjustment.value.form,
+    };
+    let res = await $_Traincostbreakdownchange(Submit);
+    const { code, msg } = res.data;
+    if (code == 200) {
+      ElMessage({
+        message: msg,
+        type: 'success',
+      });
+      Abnormaladjustment.value.dialogVisible = false;
+      onLoad();
+    }
+
+    console.log(res);
+  } catch (e) {
+    console.log(e);
+  } finally {
+    Abnormaladjustment.value.loading = false;
+  }
+};
+const confirmation = row => {
+  const { id, settlementNote } = row;
+  Confirmsettlement.value.dialogVisible = true;
+  Confirmsettlement.value.form = { id, settlementNote };
+};
+// 结算确定
+const SettlementconfirmationSubmit = async row => {
+  if (!Confirmsettlement.value.form.settlementNote) {
+    ElMessage({
+      message: '请填写结算备注',
+      type: 'warning',
+    });
+    return;
+  }
+  try {
+    Confirmsettlement.value.loading = true;
+    let Submit = {
+      ...Confirmsettlement.value.form,
+    };
+    let res = await $_Traincostbreakdownsubmit(Submit);
+    const { code, msg } = res.data;
+    if (code == 200) {
+      ElMessage({
+        message: msg,
+        type: 'success',
+      });
+      Confirmsettlement.value.dialogVisible = false;
+      onLoad();
+    }
+
+    console.log(res);
+  } catch (e) {
+    console.log(e);
+  } finally {
+    Confirmsettlement.value.loading = false;
+  }
+};
+const getAbnormalrecord = async () => {
+  try {
+    viewAbnormalrecord.value.list = true;
+    let submit = {
+      current: details.pageyd.currentPage,
+      size: details.pageyd.pageSize,
+      detailId: viewAbnormalrecord.value.detailId,
+    };
+    let res = await $_Traincostbreakdownsubmitpage(submit);
+    console.log(res);
+
+    const { code, data } = res.data;
+    if (code == 200) {
+      Abnormalrecordcdata.value = data.records;
+      details.pageyd.total = data.total;
+    }
+  } catch (e) {
+    console.log(e);
+  } finally {
+    viewAbnormalrecord.value.list = false;
+  }
+};
+// 异动记录
+const Abnormalrecord = async row => {
+  viewAbnormalrecord.value.id = row.id;
+  viewAbnormalrecord.value.dialogVisible = true;
+  nextTick(() => {
+    const _node = document.querySelector('.viewAbnormalrecord');
+    setNodeHeight(_node, '', true);
+  });
+  getAbnormalrecord();
+};
+const searchChangeSyd = () => {
+  getAbnormalrecord();
+};
 </script>
 
 <style scoped lang="scss">

src/views/desk/DataBoard.vue

@@ -772,14 +772,14 @@
 
             <div class="align_center">
               <div
-                :class="{ button: true, active: abnormal_status === 'day' }"
+                :class="{ button: true, active: abnormal_status === 'dayData' }"
-                @click="() => (abnormal_status = 'day')"
+                @click="() => (abnormal_status = 'dayData')"
               >
                 当天
               </div>
               <div
-                :class="{ button: true, active: abnormal_status === 'month' }"
+                :class="{ button: true, active: abnormal_status === 'monthData' }"
-                @click="() => (abnormal_status = 'month')"
+                @click="() => (abnormal_status = 'monthData')"
               >
                 当月
               </div>
@@ -793,7 +793,17 @@
                 <span>发起数</span>
               </div>
               <div class="mt10">
-                <span class="data mr5px">{{ abnormal_Info.sendNum }}</span>
+                <span
+                  class="data mr5px underline"
+                  @click="
+                    () =>
+                      handleShowAbnormalData('异常数据', abnormal_status, {
+                        tip: '发起数',
+                        prop: 'totalNum',
+                      })
+                  "
+                  >{{ abnormal_Info.sendNum }}</span
+                >
                 <span class="">单</span>
               </div>
             </div>
@@ -808,9 +818,9 @@
                   class="data mr5px underline"
                   @click="
                     () =>
-                      handleShowAbnormalData('异常数据', noDealNum, {
+                      handleShowAbnormalData('异常数据', abnormal_status, {
-                        tip: '总单数',
+                        tip: '待处理',
-                        prop: 'noDealNum',
+                        prop: 'unCompleteNum',
                       })
                   "
                   >{{ abnormal_Info.noDealNum }}</span
@@ -822,10 +832,20 @@
             <div class="abnormal_item red">
               <div class="align_center">
                 <img class="dataIcon mr5px " src="@/static/icon_money_day.png" alt="" />
-                <span>异常率</span>
+                <span>处理率</span>
               </div>
               <div class="mt10">
-                <span class="data mr5px">{{ abnormal_Info.abnormalRate }}</span>
+                <span
+                  class="data mr5px underline"
+                  @click="
+                    () =>
+                      handleShowAbnormalData('异常数据-处理率-%', abnormal_status, {
+                        tip: '处理率',
+                        prop: 'processingRate',
+                      },'bar')
+                  "
+                  >{{ abnormal_Info.abnormalRate }}</span
+                >
                 <span class="">%</span>
               </div>
             </div>
@@ -1044,14 +1064,14 @@
               </div>
             </div>
 
-            <div class="text_center">
+            <div class="text_center" v-if="signforData_status !== 'daySignData'">
               <div
                 class="data_box blue mb10"
                 @click="
                   handleShowSignDetail('签收数据 - 签收率 - %', signforData_status, {
                     tip: '签收率',
                     prop: 'signScale',
-                  })
+                  },'bar')
                 "
               >
                 <div class="data mr5px underline">
@@ -1086,8 +1106,8 @@
               <div
                 class="data_box purple mb10"
                 @click="
-                  handleShowSignDetail('签收数据 - 文员签收率 - %', signforData_status, {
+                  handleShowSignDetail('签收数据 - 文员签收数 - 件', signforData_status, {
-                    tip: '文员签收率',
+                    tip: '文员签收数',
                     prop: 'clerkSignforScale',
                   })
                 "
@@ -1095,10 +1115,10 @@
                 <div class="data mr5px underline">
                   {{ signforData.clerkSignforScale || 0 }}
                 </div>
-                <div class="">%</div>
+                <div class="">件</div>
               </div>
               <div class="">
-                <span>文员签收率</span>
+                <span>文员签收件</span>
               </div>
             </div>
 
@@ -1129,7 +1149,7 @@
                   handleShowSignDetail('签收数据 - 签收超时率 - %', signforData_status, {
                     tip: '签收超时率',
                     prop: 'clerkOverTimeScale',
-                  })
+                  },'bar')
                 "
               >
                 <div class="data mr5px">
@@ -1327,14 +1347,14 @@
               </div>
             </div>
 
-            <div class="text_center">
+            <div class="text_center" v-if="billSignforData_status !== 'dayBillLadingSignData'">
               <div
                 class="data_box blue mb10"
                 @click="
                   handleShowSignDetail('自提签收数据 - 签收率 - %', billSignforData_status, {
                     tip: '签收率',
                     prop: 'signScale',
-                  })
+                  },'bar')
                 "
               >
                 <div class="data mr5px underline">
@@ -1369,7 +1389,7 @@
               <div
                 class="data_box purple mb10"
                 @click="
-                  handleShowSignDetail('自提签收数据 - 文员签收率 - %', billSignforData_status, {
+                  handleShowSignDetail('自提签收数据 - 文员签收数 - 件', billSignforData_status, {
                     tip: '文员签收率',
                     prop: 'clerkSignforScale',
                   })
@@ -1378,10 +1398,10 @@
                 <div class="data mr5px underline">
                   {{ billSignforData.clerkSignforScale ? billSignforData.clerkSignforScale : 0 }}
                 </div>
-                <div class="">%</div>
+                <div class="">件</div>
               </div>
               <div class="">
-                <span>文员签收率</span>
+                <span>文员签收数</span>
               </div>
             </div>
 
@@ -1412,7 +1432,7 @@
                   handleShowSignDetail('自提签收数据 - 超时签收任务 - %', billSignforData_status, {
                     tip: '超时签收任务',
                     prop: 'clerkOverTimeScale',
-                  })
+                  },'bar')
                 "
               >
                 <div class="data mr5px underline">
@@ -1432,7 +1452,7 @@
     <!-- 详情数据 -->
     <el-dialog
       v-model="details.popUpShow.isShow"
-      width="80%"
+      width="96%"
       :append-to-body="false"
       :destroy-on-close="true"
       draggable
@@ -1580,6 +1600,18 @@ const details = reactive({
   },
   /** 异常卸车数据 */
   unloadAbnormalDataInfo: {
+    dayData: {
+      abnormalDayRate: 0,
+      abnormalMonthRate: 0,
+      noDealDayNum: 0,
+      noDealMonthNum: 0,
+      sendDayNum: 0,
+      sendMonthNum: 0,
+      unloadDayNum: 0,
+      unloadMonthNum: 0,
+      data: [],
+    },
+    monthData: {
       abnormalDayRate: 0,
       abnormalMonthRate: 0,
       noDealDayNum: 0,
@@ -1588,8 +1620,8 @@ const details = reactive({
       sendMonthNum: 0,
       unloadDayNum: 0,
       unloadMonthNum: 0,
-    dayData: [],
+      data: [],
-    monthData: [],
+    },
   },
   /** 配送数据 */
   deliveryDataInfo: {},
@@ -1670,7 +1702,7 @@ const delivery_status = ref<
 >('tradeMatching');
 
 /** 异常数据状态 */
-const abnormal_status = ref<'day' | 'month'>('day');
+const abnormal_status = ref<'dayData' | 'monthData'>('dayData');
 
 /** 签收数据状态 */
 const signforData_status = ref<'daySignData' | 'monthSignData'>('daySignData');
@@ -1770,6 +1802,8 @@ const initTrunklineCarsData = async () => {
   }
 };
 function accumulateData(targetInfo, dataArray, isMonthly) {
+  console.log('targetInfo :>> ', targetInfo);
+
   for (let i = 0; i < dataArray.length; i++) {
     const item = dataArray[i];
     if (isMonthly) {
@@ -1786,7 +1820,6 @@ function accumulateData(targetInfo, dataArray, isMonthly) {
 
 /**异常数据 */
 const initUnloadAbnormalData = async () => {
-  return
   try {
     details.loadingObj.unloadAbnormalData = true;
     const res = await $_aftersalesData({});
@@ -1795,22 +1828,24 @@ const initUnloadAbnormalData = async () => {
     const { code, data } = res.data;
     if (code !== 200) return;
     console.log(data, '异常数据');
-
+    details.unloadAbnormalDataInfo.dayData.data = data.dayData;
+    details.unloadAbnormalDataInfo.monthData.data = data.monthData;
     // 处理 dayData
-    await accumulateData(details.unloadAbnormalDataInfo, data.dayData, false);
+    await accumulateData(details.unloadAbnormalDataInfo.dayData, data.dayData, false);
-
     // 处理 monthData
-    await accumulateData(details.unloadAbnormalDataInfo, data.monthData, true);
+    await accumulateData(details.unloadAbnormalDataInfo.monthData, data.monthData, true);
-
     // 计算异常率
-    details.unloadAbnormalDataInfo.abnormalMonthRate =
+    details.unloadAbnormalDataInfo.dayData.abnormalMonthRate =
-      (details.unloadAbnormalDataInfo.abnormalMonthRate /
+      (details.unloadAbnormalDataInfo.dayData.abnormalMonthRate /
-        details.unloadAbnormalDataInfo.sendMonthNum) *
+        details.unloadAbnormalDataInfo.dayData.sendMonthNum) *
-      100;
+        100 || 0;
-
+
-    details.unloadAbnormalDataInfo.abnormalDayRate =
+    details.unloadAbnormalDataInfo.monthData.abnormalDayRate =
-      (details.unloadAbnormalDataInfo.abnormalDayRate / details.unloadAbnormalDataInfo.sendDayNum) *
+      (details.unloadAbnormalDataInfo.monthData.abnormalDayRate /
-      100;
+        details.unloadAbnormalDataInfo.monthData.sendDayNum) *
+        100 || 0;
+    // details.unloadAbnormalDataInfo.dayData.data[0].noDealNum=10
+    // details.unloadAbnormalDataInfo.dayData.data[2].noDealNum=15
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
@@ -2089,16 +2124,16 @@ handleRefresh();
 /** 异常数据 */
 const abnormal_Info = computed(() => {
   const _obj =
-    abnormal_status.value === 'day'
+    abnormal_status.value === 'dayData'
       ? {
-          sendNum: details.unloadAbnormalDataInfo.sendDayNum,
+          sendNum: details.unloadAbnormalDataInfo.dayData.sendDayNum,
-          noDealNum: details.unloadAbnormalDataInfo.noDealDayNum,
+          noDealNum: details.unloadAbnormalDataInfo.dayData.noDealDayNum,
-          abnormalRate: details.unloadAbnormalDataInfo.abnormalDayRate,
+          abnormalRate: details.unloadAbnormalDataInfo.dayData.abnormalDayRate,
         }
       : {
-          sendNum: details.unloadAbnormalDataInfo.sendMonthNum,
+          sendNum: details.unloadAbnormalDataInfo.monthData.sendMonthNum,
-          noDealNum: details.unloadAbnormalDataInfo.noDealMonthNum,
+          noDealNum: details.unloadAbnormalDataInfo.monthData.noDealMonthNum,
-          abnormalRate: details.unloadAbnormalDataInfo.abnormalMonthRate,
+          abnormalRate: details.unloadAbnormalDataInfo.monthData.abnormalMonthRate,
         };
 
   return _obj;
@@ -2121,6 +2156,7 @@ const delivery_bill_info = computed(() => {
 /** 签收数据 */
 const signforData = computed<any>(() => {
   const _obj: any = details.signforDataInfo[signforData_status.value] || {};
+  console.log('_obj :>> ', _obj);
 
   _obj.signScaleNum ? _obj.signScaleNum : (_obj.signScaleNum = _obj.signScale || 0);
   _obj.clerkSignforScaleNum
@@ -2166,109 +2202,275 @@ const billSignforData = computed<any>(() => {
 
 type OptionObjType = { prop: string; tip: string };
 
+
+// 定义两种颜色
+const colors = ['#008CBA', '#808080']; // 蓝色和灰色
+// /** 获取百分比 */
+// const getProportion = (value: number, total: number) => {
+//   if (total === 0) return '0%';
+//   if (!isNumber(value)) return '0%';
+//   return computeNumber(Number(value), '/', total).next('*', 100).result.toFixed(2) + '%';
+// };
 /** 获取百分比 */
-const getProportion = (value: number, total: number) => {
+const getProportion = (value: number) => {
-  if (total === 0) return '0%';
   if (!isNumber(value)) return '0%';
-  return computeNumber(Number(value), '/', total).next('*', 100).result.toFixed(2) + '%';
+  return (value * 100).toFixed(2) + '%';
 };
+// /** 显示图表 */
+// const handleShowEcharts = (data: any[], title: string, optionObj: OptionObjType) => {
+//   console.log('data :>> ', data);
+//   console.log('title :>> ', title);
+
+//   console.log('optionObj :>> ', optionObj);
+
+//   if (getObjType(data) !== 'array') return;
+
+//   const _arr = [];
+
+//   let _total = 0;
+
+//   for (let i = 0; i < data.length; i++) {
+//     const value = data[i];
+
+//     value[optionObj.prop] = isNumber(value[optionObj.prop]) ? Number(value[optionObj.prop]) : 0;
+
+//     _total = computeNumber(_total, '+', value[optionObj.prop]).result;
+//   }
+
+//   for (let i = 0; i < data.length; i++) {
+//     const value = data[i];
+
+//     let isContinue = false;
+
+//     for (let j = 0; j < _arr.length; j++) {
+//       const item = _arr[j];
+//       if (item.value > value[optionObj.prop]) continue;
+
+//       _arr.splice(j, 0, {
+//         name: value.warehouseName + ' - ' + getProportion(value[optionObj.prop], _total),
+//         value: value[optionObj.prop],
+//       });
+//       isContinue = true;
+//       break;
+//     }
+//     if (isContinue) continue;
+
+//     _arr.push({
+//       name: value.warehouseName + ' - ' + getProportion(value[optionObj.prop], _total),
+//       value: value[optionObj.prop],
+//     });
+//   }
+
+//   nextTick(() => {
+//     // 初始化Echarts
+//     const chartDom = document.getElementById('echartBox');
+//     const myChart = echarts.init(chartDom);
+
+//     const option = {
+//       title: {
+//         text: title,
+//         // subtext: 'Fake Data',
+//         left: 'right',
+//       },
+//       tooltip: {
+//         trigger: 'item',
+//       },
+//       legend: {
+//         orient: 'vertical',
+//         left: 'left',
+//       },
+//       series: [
+//         {
+//           name: optionObj.tip,
+//           // 数据显示类型 -- 扇形
+//           type: 'bar',
+//           // radius: '50%',
+//           // 数据
+//           data: _arr,
+//           // 激活样式
+//           emphasis: {
+//             itemStyle: {
+//               shadowBlur: 10,
+//               shadowOffsetX: 0,
+//               shadowColor: 'rgba(0, 0, 0, 0.5)',
+//             },
+//             label: {
+//               show: true,
+//               fontSize: 20,
+//               fontWeight: 'bold',
+//             },
+//           },
+//           // 扇区显示
+//           radius: ['30%', '70%'],
+//           // avoidLabelOverlap: false,
+//           // 扇区间隔
+//           // padAngle: 2,
+//           // 最小显示角度
+//           // minShowLabelAngle: 5,
+//           // 距离左侧的距离
+//           left: '20%',
+//         },
+//       ],
+//     };
+
+//     option && myChart.setOption(option);
+//   });
+// };
+// 定义显示图表的函数，接受数据、标题、选项对象和图表类型（默认为饼图）
+const handleShowEcharts = (data: any[], title: string, optionObj: OptionObjType, chartType: string = 'pie') => {
+  console.log('data :>> ', data); 
+  console.log('title :>> ', title); 
+  console.log('optionObj :>> ', optionObj); 
 
-/** 显示图表 */
+  if (getObjType(data) !== 'array') return; // 检查传入的数据是否为数组，如果不是则返回
-const handleShowEcharts = (data: any[], title: string, optionObj: OptionObjType) => {
-  if (getObjType(data) !== 'array') return;
-
-  const _arr = [];
 
-  let _total = 0;
+  const _arr = []; // 初始化一个空数组，用于存储处理后的数据
+  let _total = 0; // 初始化一个变量，用于存储数据的总和
 
+  // 遍历传入的数据数组，计算总和并转换数值
   for (let i = 0; i < data.length; i++) {
-    const value = data[i];
+    const value = data[i]; // 获取当前数据项
-
+    value[optionObj.prop] = isNumber(value[optionObj.prop]) ? Number(value[optionObj.prop]) : 0; // 确保当前数据项的值为数字，如果不是则设为 0
-    value[optionObj.prop] = isNumber(value[optionObj.prop]) ? Number(value[optionObj.prop]) : 0;
+    _total = computeNumber(_total, '+', value[optionObj.prop]).result; // 累加当前数据项的值到总和
-
-    _total = computeNumber(_total, '+', value[optionObj.prop]).result;
   }
 
+  // 遍历传入的数据数组，对数据进行排序
   for (let i = 0; i < data.length; i++) {
-    const value = data[i];
+    const value = data[i]; // 获取当前数据项
-
+    let isContinue = false; // 初始化一个标志变量，用于判断是否已插入当前数据项
-    let isContinue = false;
 
+    // 遍历 _arr 数组，找到合适的位置插入当前数据项
     for (let j = 0; j < _arr.length; j++) {
-      const item = _arr[j];
+      const item = _arr[j]; // 获取当前 _arr 中的数据项
-      if (item.value > value[optionObj.prop]) continue;
+      if (item.value > value[optionObj.prop]) continue; // 如果当前 _arr 中的数据项值大于当前数据项的值，继续下一个循环
 
-      _arr.splice(j, 0, {
+      _arr.splice(j, 0, { // 在当前位置插入当前数据项
-        name: value.warehouseName + ' - ' + getProportion(value[optionObj.prop], _total),
+        name: value.warehouseName, // 数据项的名称
-        value: value[optionObj.prop],
+        value: value[optionObj.prop], // 数据项的值
       });
-      isContinue = true;
+      isContinue = true; // 设置标志变量为 true，表示已插入当前数据项
-      break;
+      break; // 跳出内层循环
     }
-    if (isContinue) continue;
+    if (isContinue) continue; // 如果已插入当前数据项，跳过插入到数组末尾的操作
 
-    _arr.push({
+    _arr.push({ // 如果未插入，将当前数据项添加到数组末尾
-      name: value.warehouseName + ' - ' + getProportion(value[optionObj.prop], _total),
+      name: value.warehouseName, // 数据项的名称
-      value: value[optionObj.prop],
+      value: value[optionObj.prop], // 数据项的值
     });
   }
 
-  nextTick(() => {
+  nextTick(() => { // 确保 DOM 更新完成后再进行图表初始化
-    // 初始化Echarts
+    // 获取图表容器元素
     const chartDom = document.getElementById('echartBox');
-    const myChart = echarts.init(chartDom);
+    if (!chartDom) return; // 如果未找到图表容器元素，则返回
+
+    const myChart = echarts.init(chartDom); // 初始化 ECharts 实例
 
     const option = {
       title: {
-        text: title,
+        text: title, // 设置图表标题
-        // subtext: 'Fake Data',
+        left: 'right', // 标题位置
-        left: 'right',
       },
       tooltip: {
-        trigger: 'item',
+        trigger: 'item', // 设置提示框触发方式为数据项
+        formatter: (params) => {
+          if (chartType === 'pie') {
+            return `${params.name}: ${params.value} (${params.percent}%)`; // 如果是饼图，格式化提示信息为名称、值和百分比
+          } else {
+            return `${params.name}: ${getProportion(params.value)}`; // 如果是柱状图，格式化提示信息为名称和值的百分比形式
+          }
+        },
       },
       legend: {
-        orient: 'vertical',
+        orient: 'vertical', // 图例布局方向
-        left: 'left',
+        left: 'left', // 图例位置
+      },
+      ...(chartType === 'bar' && { // 如果是柱状图，添加柱状图的配置
+        xAxis: {
+          type: 'category', // x 轴类型为类别
+          data: _arr.map(item => item.name), // x 轴数据为类别名称
+          axisLabel: {
+            interval: 0, // 确保所有标签都显示
+            rotate: 45, // 旋转标签以避免重叠
+          },
+        },
+        yAxis: {
+          type: 'value', // y 轴类型为数值
+          axisLabel: {
+            formatter: (value) => {
+              return getProportion(value); // 将 y 轴标签格式化为百分比形式
+            }
+          },
         },
         series: [
           {
-          name: optionObj.tip,
+            name: optionObj.tip, // 系列名称
-          // 数据显示类型 -- 扇形
+            type: 'bar', // 系列类型为柱状图
-          type: 'pie',
+            data: _arr.map(item => ({ // 系列数据
-          // radius: '50%',
+              name: item.name, // 数据项名称
-          // 数据
+              value: item.value, // 数据项值
-          data: _arr,
+            })),
-          // 激活样式
+            itemStyle: {
+              color: (params) => {
+                // 根据数据项的索引选择颜色
+                return colors[params.dataIndex % 2];
+              }
+            },
             emphasis: {
               itemStyle: {
-              shadowBlur: 10,
+                shadowBlur: 10, // 高亮时的阴影模糊度
-              shadowOffsetX: 0,
+                shadowOffsetX: 0, // 高亮时的阴影水平偏移
-              shadowColor: 'rgba(0, 0, 0, 0.5)',
+                shadowColor: 'rgba(0, 0, 0, 0.5)', // 高亮时的阴影颜色
               },
               label: {
-              show: true,
+                show: true, // 显示高亮标签
-              fontSize: 20,
+                fontSize: 20, // 高亮标签字体大小
-              fontWeight: 'bold',
+                fontWeight: 'bold', // 高亮标签字体粗细
+                formatter: (params) => {
+                  return getProportion(params.value); // 高亮标签格式化为百分比形式
+                }
               },
             },
-          // 扇区显示
+            barGap: '30%', // 柱子之间的间隔
-          radius: ['30%', '70%'],
+            barWidth: '40%', // 柱子的宽度
-          // avoidLabelOverlap: false,
+            left: '20%', // 柱状图的左偏移
-          // 扇区间隔
-          // padAngle: 2,
-          // 最小显示角度
-          // minShowLabelAngle: 5,
-          // 距离左侧的距离
-          left: '20%',
           },
         ],
+      }),
+      ...(chartType === 'pie' && { // 如果是饼图，添加饼图的配置
+        series: [
+          {
+            name: optionObj.tip, // 系列名称
+            type: 'pie', // 系列类型为饼图
+            data: _arr.map((item) => ({ // 系列数据
+              name: item.name + ' - ' + getProportion(item.value / _total), // 数据项名称，附加百分比
+              value: item.value, // 数据项值
+            })),
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10, // 高亮时的阴影模糊度
+                shadowOffsetX: 0, // 高亮时的阴影水平偏移
+                shadowColor: 'rgba(0, 0, 0, 0.5)', // 高亮时的阴影颜色
+              },
+              label: {
+                show: true, // 显示高亮标签
+                fontSize: 20, // 高亮标签字体大小
+                fontWeight: 'bold', // 高亮标签字体粗细
+              },
+            },
+            radius: ['30%', '70%'], // 饼图的内半径和外半径
+            left: '20%', // 饼图的左偏移
+          },
+        ],
+      }),
     };
 
-    option && myChart.setOption(option);
+    option && myChart.setOption(option); // 如果 option 存在，设置图表配置
   });
 };
 
+
+
 /** 请求详情 */
 const handleDetails = async (type, title, optionObj: OptionObjType) => {
   details.popUpShow.isShow = true;
@@ -2332,8 +2534,7 @@ const handleShowDeliveryDetail = (
   handleShowEcharts(data, title, optionObj);
 };
 /** 显示售后异常数据 */
-
+const handleShowAbnormalData = (title, type: 'dayData' | 'monthData', optionObj: any = {},chartType) => {
-const handleShowAbnormalData = (title, type: 'noDealNum', optionObj: any = {}) => {
   details.popUpShow.isShow = true;
   details.title = title;
   console.log(optionObj, 'optionObj');
@@ -2342,21 +2543,23 @@ const handleShowAbnormalData = (title, type: 'noDealNum', optionObj: any = {}) =
 
   if (getObjType(details.unloadAbnormalDataInfo[type]) !== 'object') return;
 
-
+  const { data } = details.unloadAbnormalDataInfo[type];
-  const { data } = details.deliveryDataInfo[type];
+  handleShowEcharts(data, title, optionObj,chartType);
-
-
-  handleShowEcharts(data, title, optionObj);
 };
 
 /** 显示签收详情 */
 const handleShowSignDetail = (
   title,
   type: 'daySignData' | 'monthSignData' | 'dayBillLadingSignData' | 'monthBillLadingSignData',
-  optionObj: any = {}
+  optionObj: any = {},
+  chartType
 ) => {
   details.popUpShow.isShow = true;
   details.title = title;
+  console.log(type, 'typeaaa');
+  console.log(title, 'titleaaa');
+  console.log(optionObj, 'optionObjaaa');
+  console.log(details.signforDataInfo[type], 'details.signforDataInfo[type]');
 
   if (getObjType(details.signforDataInfo[type]) !== 'object') return;
 
@@ -2364,7 +2567,7 @@ const handleShowSignDetail = (
 
   console.log('data :>> ', data);
 
-  handleShowEcharts(data, title, optionObj);
+  handleShowEcharts(data, title, optionObj,chartType);
 };
 
 /** 导出 */
@@ -2389,6 +2592,7 @@ onMounted(async () => {
   // 弹窗
   :deep(.el-overlay) {
     position: absolute;
+    height: 100vh;
   }
 
   :deep(.el-overlay-dialog) {

src/views/distribution/artery/AddVehicleStowage.vue

@@ -478,7 +478,7 @@
 
                   <el-form-item label="客户车次">
                     <el-input
-                      v-model="query.customerTrain"
+                      v-model="item.query.customerTrain"
                       placeholder="请输入客户车次"
                       clearable
                     ></el-input>

src/views/distribution/artery/addTripartiteTransfer.vue

@@ -1167,6 +1167,7 @@ const back = () => {
 const addSubmit = async () => {
   const submitData = {
     ...form.value,
+    driverMobile: '11',
     addCarsLoadLineList: [
       {
         nodeType: '1',
@@ -1211,6 +1212,7 @@ const addSubmit = async () => {
 const editSubmit = async () => {
   const submitData = {
     ...form.value,
+    driverMobile: '11',
     addCarsLoadLineList: [
       {
         nodeType: '1',

src/views/distribution/inventory/CreateOrder.vue

@@ -616,6 +616,7 @@
 
             <el-form-item label="件数:" label-width="fit-content" prop="num" class="el-times">
               <el-input-number
+                @focus="handleInputFocus"
                 :disabled="details.submitType === 'haveData'"
                 :controls="false"
                 v-model="item.num"
@@ -631,6 +632,7 @@
 
             <el-form-item label="体积(方):" label-width="fit-content" class="el-times">
               <el-input-number
+                @focus="handleInputFocus"
                 :controls="false"
                 v-model="item.volume"
                 controls-position="right"
@@ -644,6 +646,7 @@
 
             <el-form-item label="重量(kg):" label-width="fit-content" class="el-times">
               <el-input-number
+                @focus="handleInputFocus"
                 :controls="false"
                 v-model="item.weight"
                 controls-position="right"
@@ -657,6 +660,7 @@
 
             <el-form-item label="单价:" label-width="fit-content" class="el-times">
               <el-input-number
+                @focus="handleInputFocus"
                 :controls="false"
                 v-model="item.price"
                 controls-position="right"
@@ -670,6 +674,7 @@
 
             <el-form-item label="运费小计:" label-width="fit-content" class="el-times">
               <el-input-number
+                @focus="handleInputFocus"
                 :controls="false"
                 v-model="item.subtotalFreight"
                 :precision="2"
@@ -742,6 +747,7 @@
                       ></el-input> -->
 
                         <el-input-number
+                          @focus="handleInputFocus"
                           :controls="false"
                           controls-position="right"
                           :precision="2"
@@ -755,6 +761,7 @@
 
                       <el-form-item label="送货费:">
                         <el-input-number
+                          @focus="handleInputFocus"
                           :controls="false"
                           controls-position="right"
                           :precision="2"
@@ -767,6 +774,7 @@
 
                       <el-form-item label="提货费:">
                         <el-input-number
+                          @focus="handleInputFocus"
                           :disabled="!query.isPickUp"
                           :controls="false"
                           :precision="2"
@@ -779,6 +787,7 @@
 
                       <el-form-item label="仓库管理费:">
                         <el-input-number
+                          @focus="handleInputFocus"
                           :controls="false"
                           controls-position="right"
                           :precision="2"
@@ -791,6 +800,7 @@
 
                       <el-form-item label="仓储费:">
                         <el-input-number
+                          @focus="handleInputFocus"
                           :controls="false"
                           controls-position="right"
                           :precision="2"
@@ -805,6 +815,7 @@
                     <el-row>
                       <el-form-item label="仓储操作费:">
                         <el-input-number
+                          @focus="handleInputFocus"
                           :controls="false"
                           controls-position="right"
                           :precision="2"
@@ -817,6 +828,7 @@
 
                       <el-form-item label="仓储分拣费:">
                         <el-input-number
+                          @focus="handleInputFocus"
                           :controls="false"
                           controls-position="right"
                           :precision="2"
@@ -829,6 +841,7 @@
 
                       <el-form-item label="其它费用:">
                         <el-input-number
+                          @focus="handleInputFocus"
                           :controls="false"
                           controls-position="right"
                           :precision="2"
@@ -840,6 +853,7 @@
                       </el-form-item>
                       <el-form-item label="保价费:">
                         <el-input-number
+                          @focus="handleInputFocus"
                           :controls="false"
                           controls-position="right"
                           v-model="query.insuranceFee"
@@ -851,6 +865,7 @@
                       </el-form-item>
                       <el-form-item label="申明价值:">
                         <el-input-number
+                          @focus="handleInputFocus"
                           :controls="false"
                           controls-position="right"
                           v-model="query.claimingValue"
@@ -865,6 +880,7 @@
                     <el-row>
                       <el-form-item label="安装费:">
                         <el-input-number
+                          @focus="handleInputFocus"
                           :controls="false"
                           controls-position="right"
                           :precision="2"
@@ -917,6 +933,7 @@
 
                     <el-form-item label-width="fit-content" label="现付:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :controls="false"
                         controls-position="right"
                         :precision="2"
@@ -931,6 +948,7 @@
                   <el-row>
                     <el-form-item label-width="fit-content" label="到付:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :controls="false"
                         controls-position="right"
                         :precision="2"
@@ -943,6 +961,7 @@
 
                     <el-form-item label-width="fit-content" label="月结:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :controls="false"
                         controls-position="right"
                         :precision="2"
@@ -955,6 +974,7 @@
 
                     <el-form-item label-width="fit-content" label="回付:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :controls="false"
                         controls-position="right"
                         :precision="2"
@@ -980,6 +1000,7 @@
 
             <el-form-item label="三方操作费:" label-width="fit-content" class="el-times">
               <el-input-number
+                @focus="handleInputFocus"
                 :controls="false"
                 v-model="query.thirdOperationFee"
                 controls-position="right"
@@ -1018,6 +1039,7 @@
 
             <el-form-item label="回单" label-width="fit-content" class="el-times">
               <el-input-number
+                @focus="handleInputFocus"
                 :controls="false"
                 v-model="query.receiptNum"
                 controls-position="right"
@@ -1167,6 +1189,7 @@
               <template #default="slotProps">
                 <template v-if="slotProps.scope.column.label === '方数'">
                   <el-input-number
+                    @focus="handleInputFocus"
                     :controls="false"
                     v-model="slotProps.scope.row.confirmVolume"
                     :precision="4"
@@ -1176,6 +1199,7 @@
 
                 <template v-else-if="slotProps.scope.column.label === '重量'">
                   <el-input-number
+                    @focus="handleInputFocus"
                     :controls="false"
                     v-model="slotProps.scope.row.confirmWeight"
                     :precision="3"
@@ -3717,6 +3741,32 @@ const handleComputedPlanPrice = submitData => {
   }
 };
 
+/** 聚焦后全选 */
+const handleInputFocus = e => {
+  e.srcElement.select();
+};
+
+const getTranslationArr = codeArr => {
+  const _nameArr = [];
+  let _item = {};
+
+  _nameArr[0] = details.regionOptione.find(val => val.value === codeArr[0]);
+
+  _nameArr[1] = _nameArr[0].children.find(val => val.value === codeArr[1]);
+
+  if (codeArr.length === 2) {
+    _item = _nameArr[1];
+  } else {
+    _nameArr[2] = _nameArr[1].children.find(val => val.value === codeArr[2]);
+    _item = _nameArr[2];
+  }
+
+  return {
+    locationItem: _item,
+    nameArr: _nameArr,
+  };
+};
+
 /** 提交 */
 const handleSubmit = (formEl: FormInstance | undefined) => {
   if (!formEl) return;
@@ -3785,33 +3835,19 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
         }
 
         // 筛选到站
-        const _findeLocation = details.regionOptione
+        const { locationItem: _itemDestination, nameArr: dest_nameArr } =
-          .find(val => val.value === destination[0])
+          getTranslationArr(destination);
-          .children.find(val => val.value === destination[1]);
 
-        let _item: any = {};
+        submitData.destination = _itemDestination.label;
-        if (destination.length === 2) {
+        submitData.destinationCode = _itemDestination.value;
-          _item = _findeLocation;
+        submitData.completeDestination = dest_nameArr.map(val => val.label).join('/');
-        } else {
-          _item = _findeLocation.children.find(val => val.value === destination[2]);
-        }
-        submitData.destination = _item.label;
-        submitData.destinationCode = _item.value;
 
         // 筛选发站
-        const _findeDeparture = details.regionOptione
+        const { locationItem: _itemDeparture, nameArr: de_nameArr } = getTranslationArr(departure);
-          .find(val => val.value === departure[0])
-          .children.find(val => val.value === departure[1]);
-
-        let _itemDeparture: any = {};
-        if (departure.length === 2) {
-          _itemDeparture = _findeDeparture;
-        } else {
-          _itemDeparture = _findeDeparture.children.find(val => val.value === departure[2]);
-        }
 
         submitData.departure = _itemDeparture.label;
         submitData.departureCode = _itemDeparture.value;
+        submitData.completeDeparture = de_nameArr.map(val => val.label).join('/');
 
         console.log('submitData :>> ', submitData);
 

src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue

@@ -467,18 +467,19 @@ import {
   getObjType,
   handleClearTableQuery,
   handleSelectQuery,
+  handleTranslationDataSeclect,
 } from '@/utils/util';
 import { columnList } from '@/option/distribution/distributionStockArticleSelf';
 import { deepClone, hanleTextLineFeed } from '@/utils/util.js';
 import { ElMessage, ElMessageBox } from 'element-plus';
 const _newCol = deepClone(columnList);
-for (let i = 0; i < _newCol.length; i++) {
+// for (let i = 0; i < _newCol.length; i++) {
-  const val = _newCol[i];
+//   const val = _newCol[i];
 
-  if (val.label !== '超时状态') continue;
+//   if (val.label !== '超时状态') continue;
-  _newCol.splice(i, 1);
+//   _newCol.splice(i, 1);
-  break;
+//   break;
-}
+// }
 export default {
   data() {
     return {
@@ -1297,10 +1298,9 @@ export default {
           item.transferQuantity = nuMap[item.transferQuantity] || item.transferQuantity;
           item.availableQuantity = nuMap[item.availableQuantity] || item.availableQuantity;
           item.notReceived = parseInt(item.totalNumber) - parseInt(item.incomingNum);
-          item.isZeroName = Number(item.isZero) === 0 ? '否' : '是';
-
-          item.completeSetName = Number(item.completeSet) === 2 ? '已齐套' : '未齐套';
         }
+
+        handleTranslationDataSeclect(this.data, this.columnList);
         this.selectionClear();
       } catch (error) {
         console.log('error :>> ', error);

src/views/waybill/CreateZeroOrder.vue

@@ -575,6 +575,7 @@
 
           <el-form-item label="件数:" label-width="fit-content" prop="num" class="el-times">
             <el-input-number
+              @focus="handleInputFocus"
               :disabled="query.zeroEditStatus === 0"
               :value-on-clear="0"
               :controls="false"
@@ -588,6 +589,7 @@
 
           <el-form-item label="体积(方):" label-width="fit-content" class="el-times">
             <el-input-number
+              @focus="handleInputFocus"
               :value-on-clear="0"
               :controls="false"
               v-model="item.volume"
@@ -600,6 +602,7 @@
 
           <el-form-item label="重量(kg):" label-width="fit-content" class="el-times">
             <el-input-number
+              @focus="handleInputFocus"
               :value-on-clear="0"
               :controls="false"
               v-model="item.weight"
@@ -612,6 +615,7 @@
 
           <el-form-item label="单价:" label-width="fit-content" class="el-times">
             <el-input-number
+              @focus="handleInputFocus"
               :value-on-clear="0"
               :controls="false"
               v-model="item.price"
@@ -624,6 +628,7 @@
 
           <el-form-item label="运费小计:" label-width="fit-content" class="el-times">
             <el-input-number
+              @focus="handleInputFocus"
               :value-on-clear="0"
               :controls="false"
               v-model="item.subtotalFreight"
@@ -681,6 +686,7 @@
                     <el-form-item label="运费:">
                       <!-- <el-input v-model="details.totalObj.totalFreight" disabled></el-input> -->
                       <el-input-number
+                        @focus="handleInputFocus"
                         :controls="false"
                         :precision="2"
                         :min="0"
@@ -693,6 +699,7 @@
 
                     <el-form-item label="送货费:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :value-on-clear="0"
                         :controls="false"
                         :precision="2"
@@ -704,6 +711,7 @@
 
                     <el-form-item label="提货费:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :value-on-clear="0"
                         :controls="false"
                         :precision="2"
@@ -715,6 +723,7 @@
 
                     <el-form-item label="仓库管理费:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :value-on-clear="0"
                         :controls="false"
                         :precision="2"
@@ -726,6 +735,7 @@
 
                     <el-form-item label="仓储费:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :value-on-clear="0"
                         :controls="false"
                         :precision="2"
@@ -739,6 +749,7 @@
                   <el-row>
                     <el-form-item label="仓储操作费:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :value-on-clear="0"
                         :controls="false"
                         :precision="2"
@@ -750,6 +761,7 @@
 
                     <el-form-item label="仓储分拣费:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :controls="false"
                         controls-position="right"
                         :precision="2"
@@ -762,6 +774,7 @@
 
                     <el-form-item label="其它费用:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :value-on-clear="0"
                         :controls="false"
                         :precision="2"
@@ -772,6 +785,7 @@
                     </el-form-item>
                     <el-form-item label="保价费:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :value-on-clear="0"
                         :controls="false"
                         :precision="2"
@@ -782,6 +796,7 @@
                     </el-form-item>
                     <el-form-item label="申明价值:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :value-on-clear="0"
                         :controls="false"
                         :precision="2"
@@ -795,6 +810,7 @@
                   <el-row>
                     <el-form-item label="回扣:" style="flex: none !important">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :value-on-clear="0"
                         :controls="false"
                         :precision="2"
@@ -805,6 +821,7 @@
                     </el-form-item>
                     <el-form-item label="安装费:">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :value-on-clear="0"
                         :controls="false"
                         :precision="2"
@@ -862,6 +879,7 @@
 
                   <el-form-item label-width="fit-content" label="现付:">
                     <el-input-number
+                      @focus="handleInputFocus"
                       :value-on-clear="0"
                       :controls="false"
                       :precision="2"
@@ -875,6 +893,7 @@
                 <el-row>
                   <el-form-item label-width="fit-content" label="到付:">
                     <el-input-number
+                      @focus="handleInputFocus"
                       :value-on-clear="0"
                       :controls="false"
                       :precision="2"
@@ -886,6 +905,7 @@
 
                   <el-form-item label-width="fit-content" label="月结:">
                     <el-input-number
+                      @focus="handleInputFocus"
                       :value-on-clear="0"
                       :controls="false"
                       :precision="2"
@@ -897,6 +917,7 @@
 
                   <el-form-item label-width="fit-content" label="回付:">
                     <el-input-number
+                      @focus="handleInputFocus"
                       :value-on-clear="0"
                       :controls="false"
                       :precision="2"
@@ -922,6 +943,7 @@
                     <div style="font-size: 14px">代收货款:</div>
                     <el-form-item label-width="0">
                       <el-input-number
+                        @focus="handleInputFocus"
                         :value-on-clear="0"
                         :controls="false"
                         :precision="2"
@@ -947,6 +969,7 @@
 
           <el-form-item label="三方操作费:" label-width="fit-content" class="el-times">
             <el-input-number
+              @focus="handleInputFocus"
               :value-on-clear="0"
               :controls="false"
               v-model="query.thirdOperationFee"
@@ -984,6 +1007,7 @@
 
           <el-form-item label="回单" label-width="fit-content" class="el-times">
             <el-input-number
+              @focus="handleInputFocus"
               :value-on-clear="0"
               :controls="false"
               v-model="query.receiptNum"
@@ -2617,6 +2641,11 @@ const handlePrice = (isAll = false, type) => {
   (isAll || type === 'warehouseSorting') && handleWarehouseSortingFee();
 };
 
+/** 聚焦后全选 */
+const handleInputFocus = e => {
+  e.srcElement.select();
+};
+
 /** 重置值 */
 const handleRefreshText = (key, value, refreshValue?: string | number) => {
   if (value) return;
@@ -2884,6 +2913,27 @@ const handleComputedPlanPrice = submitData => {
   }
 };
 
+const getTranslationArr = codeArr => {
+  const _nameArr = [];
+  let _item = {};
+
+  _nameArr[0] = details.regionOptione.find(val => val.value === codeArr[0]);
+
+  _nameArr[1] = _nameArr[0].children.find(val => val.value === codeArr[1]);
+
+  if (codeArr.length === 2) {
+    _item = _nameArr[1];
+  } else {
+    _nameArr[2] = _nameArr[1].children.find(val => val.value === codeArr[2]);
+    _item = _nameArr[2];
+  }
+
+  return {
+    locationItem: _item,
+    nameArr: _nameArr,
+  };
+};
+
 /** 提交 */
 const handleSubmit = async (formEl: FormInstance | undefined) => {
   await nextTick();
@@ -2956,34 +3006,20 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
             return ElMessage({ message: '请选择正确发站地址', type: 'warning' });
 
           // 筛选到站
-          const _findeLocation = details.regionOptione
+          const { locationItem: _itemDestination, nameArr: dest_nameArr } =
-            .find(val => val.value === destination[0])
+            getTranslationArr(destination);
-            .children.find(val => val.value === destination[1]);
 
-          let _item: any = {};
+          submitData.destination = _itemDestination.label;
-          if (destination.length === 2) {
+          submitData.destinationCode = _itemDestination.value;
-            _item = _findeLocation;
+          submitData.completeDestination = dest_nameArr.map(val => val.label).join('/');
-          } else {
-            _item = _findeLocation.children.find(val => val.value === destination[2]);
-          }
-
-          submitData.destination = _item.label;
-          submitData.destinationCode = _item.value;
 
           // 筛选发站
-          const _findeDeparture = details.regionOptione
+          const { locationItem: _itemDeparture, nameArr: de_nameArr } =
-            .find(val => val.value === departure[0])
+            getTranslationArr(departure);
-            .children.find(val => val.value === departure[1]);
-
-          let _itemDeparture: any = {};
-          if (departure.length === 2) {
-            _itemDeparture = _findeDeparture;
-          } else {
-            _itemDeparture = _findeDeparture.children.find(val => val.value === departure[2]);
-          }
 
           submitData.departure = _itemDeparture.label;
           submitData.departureCode = _itemDeparture.value;
+          submitData.completeDeparture = de_nameArr.map(val => val.label).join('/');
 
           // let numFlag = false;
 

src/views/waybill/WaybillOrderList.vue

@@ -190,7 +190,7 @@
           background
           @size-change="sizeChange"
           @current-change="currentChange"
-          :current-page="page.currentPage"
+          :current-page="page.pageNum"
           :page-sizes="[30, 50, 80, 120]"
           :page-size="page.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
@@ -572,7 +572,7 @@ const searchChange = () => {
 /** 清空表单 */
 const searchReset = () => {
   details.query = {};
-  details.page.currentPage = 1;
+  details.page.pageNum = 1;
   handleClearTableQuery(details.columnList);
   onLoad(details.page);
 };