From 9a87d6c66b29030e694281d29dcb4fb5c4d345a3 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 11 Dec 2024 09:51:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=94=B6=E5=85=A5=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reportforms/ConsigneeReport.js        |  28 +
 src/option/reportforms/ConsigneeReport.js     | 297 ++++++++++
 .../SalesDepartmentIncomeReport.js            |  15 +-
 src/views/reportforms/ConsigneeReport.vue     | 522 ++++++++++++++++++
 4 files changed, 860 insertions(+), 2 deletions(-)
 create mode 100644 src/api/reportforms/ConsigneeReport.js
 create mode 100644 src/option/reportforms/ConsigneeReport.js
 create mode 100644 src/views/reportforms/ConsigneeReport.vue

diff --git a/src/api/reportforms/ConsigneeReport.js b/src/api/reportforms/ConsigneeReport.js
new file mode 100644
index 00000000..b0563337
--- /dev/null
+++ b/src/api/reportforms/ConsigneeReport.js
@@ -0,0 +1,28 @@
+import request from '@/axios';
+/** 报表列表 */
+export const postDeptIncomingPage = params => {
+  return request({
+    url: '/api/logpm-report/reportIncoming/consigineeIncomingPage',
+    method: 'get',
+    params,
+  });
+};
+
+/** 查询事业线 */
+export const postFindbusinessLine = () => {
+  return request({
+    url: '/api/logpm-basicdata/warehouse/findBusunessLineList',
+    method: 'get',
+    params: {},
+  });
+};
+
+/** 报表导出 */
+export const postDeptIncomingExport = params => {
+  return request({
+    url: '/api/logpm-report/reportIncoming/consigineeIncomingExport',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  });
+};
diff --git a/src/option/reportforms/ConsigneeReport.js b/src/option/reportforms/ConsigneeReport.js
new file mode 100644
index 00000000..be309c6b
--- /dev/null
+++ b/src/option/reportforms/ConsigneeReport.js
@@ -0,0 +1,297 @@
+export const columnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'consignee',
+    label: '收货单位',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'businessLine',
+    label: '事业线',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'departureWarehouseName',
+    label: '始发仓',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'destinationWarehouseName',
+    label: '目的仓',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'brand',
+    label: '品牌',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'waybillNum',
+    label: '运单数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'num',
+    label: '件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'weight',
+    label: '重量',
+    type: 1,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'volume',
+    label: '体积',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'stockNum',
+    label: '到货件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'signNum',
+    label: '签收件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'pickupFee',
+    label: '提货费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'freightFee',
+    label: '运费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'deliveryFee',
+    label: '送货费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'warehouseManagementFee',
+    label: '仓库管理费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'storageFee',
+    label: '仓储费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'nian',
+    label: '年',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'yue',
+    label: '月',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'timeStr',
+    label: '时间周期',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'handlingFee',
+    label: '仓储操作费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'sortingFee',
+    label: '仓储分拣费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'installFee',
+    label: '安装费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'otherFee',
+    label: '其他费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'totalFee',
+    label: '总费用',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+];
diff --git a/src/option/reportforms/SalesDepartmentIncomeReport.js b/src/option/reportforms/SalesDepartmentIncomeReport.js
index 2e30d079..bab766bf 100644
--- a/src/option/reportforms/SalesDepartmentIncomeReport.js
+++ b/src/option/reportforms/SalesDepartmentIncomeReport.js
@@ -191,8 +191,19 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'startWareOutTime',
-    label: '始发仓发货日期',
+    prop: 'nian',
+    label: '年',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'yue',
+    label: '月',
     type: 1,
     values: '',
     width: '150',
diff --git a/src/views/reportforms/ConsigneeReport.vue b/src/views/reportforms/ConsigneeReport.vue
new file mode 100644
index 00000000..f78127d1
--- /dev/null
+++ b/src/views/reportforms/ConsigneeReport.vue
@@ -0,0 +1,522 @@
+<template>
+  <basic-container v-loading="details.loadingObj.pageLoading">
+    <div class="avue-crud">
+      <!-- 搜索模块 -->
+      <div v-h5uShow="search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query" class="header_search" label-width="100px">
+          <el-form-item label="品牌" prop="brandId">
+            <el-select
+              class="w100"
+              v-model="query.brand"
+              filterable
+              placeholder="请选择"
+              default-first-option
+              clearable
+            >
+              <el-option
+                v-for="item in details.brandOptions"
+                :key="item.brandId"
+                :label="item.brandName"
+                :value="item.brandId"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="年份">
+            <el-date-picker
+              v-model="query.year"
+              type="year"
+              format="YYYY"
+              placeholder="请选择"
+              value-format="YYYY"
+              @change="
+                () => {
+                  delete details.query.month;
+                  delete details.query.timeArr;
+                }
+              "
+            />
+          </el-form-item>
+
+          <el-form-item label="月份">
+            <el-date-picker
+              v-model="query.month"
+              type="month"
+              format="YYYY-MM"
+              placeholder="请选择"
+              value-format="YYYY-MM"
+              @change="
+                () => {
+                  delete details.query.year;
+                  delete details.query.timeArr;
+                }
+              "
+            />
+          </el-form-item>
+
+          <el-form-item label="时间周期">
+            <el-date-picker
+              v-model="query.timeArr"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              value-format="YYYY-MM-DD"
+              @change="
+                () => {
+                  delete details.query.year;
+                  delete details.query.month;
+                }
+              "
+            />
+          </el-form-item>
+
+          <el-form-item label="事业线">
+            <el-select
+              class="w100"
+              v-model="query.businessLine"
+              filterable
+              placeholder="请选择"
+              default-first-option
+              clearable
+            >
+              <el-option
+                v-for="item in details.businessLineOption"
+                :key="item"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="始发仓">
+            <el-input v-model="query.departureWarehouseName" placeholder="请输入" clearable />
+          </el-form-item>
+
+          <el-form-item label="目的仓">
+            <el-input v-model="query.destinationWarehouseName" placeholder="请输入" clearable />
+          </el-form-item>
+
+          <!-- 查询按钮 -->
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <!-- 控件模块 -->
+      <div class="avue-crud__header flex-c-sb">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left">
+          <el-button type="primary" icon="Download" @click="ExportData"> 导出 </el-button>
+        </div>
+        <!-- 头部右侧按钮模块 -->
+        <div class="avue-crud__right">
+          <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+          <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+          <el-button icon="Search" @click="searchHide" circle></el-button>
+        </div>
+      </div>
+
+      <!-- 表格 -->
+      <!-- 列表模块 -->
+      <tablecmt
+        ref="tableNodeRef"
+        :columnList="details.columnList"
+        :tableData="details.data"
+        :loading="loadingObj.list"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @btnCheck="btnsc"
+        @selectCheck="selectsc"
+        @selection="selectionChange"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '操作'"> </template>
+        </template>
+      </tablecmt>
+
+      <!-- 分页模块 -->
+      <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+        <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+        <!-- 分页模块 -->
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          :current-page="page.pageNum"
+          :page-sizes="[30, 50, 80, 120, 500]"
+          :page-size="page.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="page.total"
+        >
+        </el-pagination>
+      </div>
+    </div>
+  </basic-container>
+
+  <edittablehead
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="details.columnList"
+    v-model="details.columnList"
+  ></edittablehead>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, toRefs, computed } from 'vue';
+import functions from '@/utils/functions.js';
+import dayjs from 'dayjs';
+import { mapGetters, useStore } from 'vuex';
+/** 获取字典 */
+import { getDictionaryBiz } from '@/api/system/dict';
+import { postFindBrandList } from '@/api/waybill/TemporaryStorageList';
+import {
+  postDeptIncomingPage,
+  postFindbusinessLine,
+  postDeptIncomingExport,
+} from '@/api/reportforms/ConsigneeReport';
+import {
+  setNodeHeight,
+  getHtmls,
+  deepClone,
+  getObjType,
+  handleTranslationDataSeclect,
+  handleClearTableQuery,
+  handleSelectQuery,
+  handleInputQuery,
+  downloadXls,
+} from '@/utils/util';
+import { useRouter } from 'vue-router';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { columnList } from '@/option/reportforms/ConsigneeReport';
+
+// 获取路由实例
+const $router = useRouter();
+const $store = useStore();
+
+// 组件实例
+const tableNodeRef = ref();
+
+const details = reactive<any>({
+  /** 是否开启搜索 */
+  search: true,
+  /** 表格搜索条件 */
+  query: {},
+  /** 时间快捷选择设置 */
+  shortcuts: [
+    {
+      text: '最近一周',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近一个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近三个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+        return [start, end];
+      },
+    },
+  ],
+  columnList: deepClone(columnList),
+  data: [],
+  /** 头部搜索配置 */
+  titleSearchOption: [],
+  /** 流转节点数据 */
+  flowNodeData: [],
+  /** 页面loading */
+  loadingObj: {
+    /** 列表加载loading */
+    list: false,
+    packageListLoading: false,
+  },
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    pageNum: 1,
+    pageSize: 30,
+    total: 0,
+  },
+  /** 品牌 */
+  brandOptions: [],
+  /** 事业线 */
+  businessLineOption: [],
+  /** 弹出层显示 */
+  popUpShow: {},
+  /** 全屏 */
+  fullscreenObj: {},
+});
+
+const { search, query, shortcuts, loadingObj, selectionList, drawerShow, page } = toRefs(details);
+
+/** vuex */
+const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
+console.log('permission :>> ', permission);
+
+/** 权限按钮 */
+const permissionObj = reactive({});
+
+/** 请求页面数据 */
+const onLoad = async (params = {}) => {
+  try {
+    details.loadingObj.list = true;
+
+    const submitData = { ...details.page, ...details.query, ...params };
+
+    for (const key in submitData) {
+      const element = submitData[key];
+
+      if (!element && element !== 0) delete submitData[key];
+    }
+
+    // 月
+    if (submitData.month) {
+      const _arr = submitData.month.split('-');
+      submitData.year = _arr[0];
+      submitData.month = _arr[1];
+    }
+
+    // 时间周期
+    else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
+      submitData.startTimeStr = submitData.timeArr[0];
+      submitData.endTimeStr = submitData.timeArr[1];
+    }
+
+    if (
+      (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) &&
+      !submitData.year &&
+      !submitData.month
+    ) {
+      details.data = [];
+      return ElMessage.warning('请选择时间');
+    }
+
+    delete submitData.timeArr;
+    delete submitData.total;
+
+    const res = await postDeptIncomingPage(submitData);
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.data = getObjType(data.records) === 'array' ? data.records : [];
+    details.page.total = data.total;
+
+    handleTranslationDataSeclect(details.data, details.columnList);
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.list = false;
+  }
+};
+
+const init = () => {
+  const time = new Date().getTime();
+
+  details.query.timeArr = [
+    dayjs(time - 1000 * 60 * 60 * 24 * 7).format('YYYY-MM-DD'),
+    dayjs(time).format('YYYY-MM-DD'),
+  ];
+
+  onLoad();
+};
+
+init();
+
+/** 查询品牌 */
+const handleFindBrand = async () => {
+  try {
+    const res = await postFindBrandList();
+    console.log('res :>> ', res);
+    const { data, code } = res.data;
+    if (code !== 200) return;
+    console.log('data :>> ', data);
+    details.brandOptions = data || [];
+  } catch (error) {
+    console.log('error :>> ', error);
+  }
+};
+
+/** 查询事业线 */
+const handleFindbusinessLine = async () => {
+  try {
+    const res = await postFindbusinessLine();
+    console.log('res :>> ', res);
+    const { data, code } = res.data;
+    if (code !== 200) return;
+    console.log('data :>> ', data);
+    details.businessLineOption = data || [];
+  } catch (error) {
+    console.log('error :>> ', error);
+  }
+};
+handleFindbusinessLine();
+
+handleFindBrand();
+
+/** 搜索 */
+const searchChange = () => {
+  onLoad();
+};
+
+/** 清空表单 */
+const searchReset = () => {
+  details.query = {};
+  details.page.pageNum = 1;
+  handleClearTableQuery(details.columnList);
+  onLoad();
+};
+
+/** 展开列表控件 */
+const showdrawer = (_flag?: boolean) => {
+  details.drawerShow = _flag;
+};
+
+/** 是否开启搜索区 */
+const searchHide = () => {
+  details.search = !details.search;
+
+  setNodeHeight(tableNodeRef.value.$el, '', true);
+};
+
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  handleInputQuery(index, row, details.query);
+  onLoad();
+};
+
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
+  console.log(index, row);
+  if (!!index) {
+    index = dayjs(index).format('YYYY-MM-DD');
+  }
+  details.query[row.prop] = index;
+  if (!index) {
+    delete details.query[row.prop];
+  }
+  onLoad();
+};
+
+/** 表格表头输入框搜索 */
+const btnsc = () => {};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  handleSelectQuery(index, row, details.query);
+  onLoad();
+};
+
+/** 表格表头复选框选择 */
+const selectionChange = (list: any) => {
+  details.selectionList = list;
+};
+
+/** 每页数量改变执行的回调 */
+const sizeChange = (pageSize: number) => {
+  details.page.pageSize = pageSize;
+  onLoad();
+};
+
+/** 页码改变执行的回调 */
+const currentChange = pageNum => {
+  details.page.pageNum = pageNum;
+  onLoad();
+};
+
+/** 弹出层开启前清除数据 */
+const beforeClose = done => {
+  done();
+  details.form = {};
+  details.selectionList = [];
+  details.view = false;
+};
+
+// 导出
+const ExportData = async () => {
+  try {
+    details.loadingObj.list = true;
+
+    const submitData = { ...details.page, ...details.query };
+
+    for (const key in submitData) {
+      const element = submitData[key];
+
+      if (!element && element !== 0) delete submitData[key];
+    }
+
+    // 月
+    if (submitData.month) {
+      const _arr = submitData.month.split('-');
+      submitData.year = _arr[0];
+      submitData.month = _arr[1];
+    }
+
+    // 时间周期
+    else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
+      submitData.startTimeStr = submitData.timeArr[0];
+      submitData.endTimeStr = submitData.timeArr[1];
+    }
+
+    if (
+      (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) &&
+      !submitData.year &&
+      !submitData.month
+    ) {
+      return ElMessage.warning('请选择时间');
+    }
+
+    delete submitData.timeArr;
+    delete submitData.total;
+
+    const res = await postDeptIncomingExport(submitData);
+    const { status, data } = res;
+    if (status !== 200) return;
+    const time = new Date().getTime();
+    downloadXls(data, '营业部收入报表 -' + time + '.xlsx');
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.list = false;
+  }
+};
+</script>
+
+<style scoped lang="scss">
+// 日期选择器
+:deep(.el-date-editor.el-input) {
+  height: 100% !important;
+  width: 100% !important;
+}
+
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 100% !important;
+}
+.el_div_input {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  .el_dy_icon {
+    font-size: 1.5em;
+  }
+}
+</style>

From 6483b20edc601a9b746694ba872823d45383a243 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 11 Dec 2024 18:09:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=B9=B2=E7=BA=BF=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=91=8A=EF=BC=8C=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F=E7=BB=93=E7=AE=97=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bulletinboard/index.js                |   9 +
 .../reportforms/DeliveryStatisticsReport.js   |  22 +-
 src/router/views/index.js                     |   1 +
 .../warehouse/basicdataWarehouse.vue          |  46 ++-
 src/views/finance/CustomerSettlement.vue      |  40 ++-
 src/views/wel/bulletinboard/bulletinboard.vue | 296 ++++++++++++++++++
 src/views/wel/index.vue                       |  46 ++-
 7 files changed, 440 insertions(+), 20 deletions(-)
 create mode 100644 src/api/bulletinboard/index.js
 create mode 100644 src/views/wel/bulletinboard/bulletinboard.vue

diff --git a/src/api/bulletinboard/index.js b/src/api/bulletinboard/index.js
new file mode 100644
index 00000000..cb93b44f
--- /dev/null
+++ b/src/api/bulletinboard/index.js
@@ -0,0 +1,9 @@
+import request from '@/axios';
+
+export const $_homeList = params => {
+  return request({
+    url: '/api/logpm-basic/notice/homeList',
+    method: 'get',
+    params,
+  });
+};
diff --git a/src/option/reportforms/DeliveryStatisticsReport.js b/src/option/reportforms/DeliveryStatisticsReport.js
index 7a830e9f..44feeda8 100644
--- a/src/option/reportforms/DeliveryStatisticsReport.js
+++ b/src/option/reportforms/DeliveryStatisticsReport.js
@@ -155,17 +155,6 @@ export const columnList = [
     sortable: true,
     head: false,
   },
-  {
-    prop: 'reviewOnTimeRate',
-    label: '复核及时率',
-    type: 6,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
 
   {
     prop: 'exceptionNum',
@@ -225,6 +214,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'reviewOnTimeRate',
+    label: '复核及时率',
+    type: 6,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'createUserName',
     label: '操作',
diff --git a/src/router/views/index.js b/src/router/views/index.js
index d2c50dd2..87571050 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -12,6 +12,7 @@ export default [
         name: '首页',
         meta: {
           i18n: 'dashboard',
+          keepAlive: true,
         },
         component: () => import(/* webpackChunkName: "views" */ '@/views/wel/index.vue'),
       },
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index 8e800c2d..604f0af6 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -513,6 +513,45 @@
         <el-form-item label="默认库位" v-if="Expandconfigurationform.isAutoWarehouse">
           <el-input v-model="Expandconfigurationform.defaultAllocation" style="width: 240px" placeholder="请输入默认库位" />
         </el-form-item>
+        <el-form-item label="是否干线上传装车图片">
+          <el-select
+            v-model="Expandconfigurationform.isTrunklineLoadingPhoto"
+            placeholder="请选择是否干线上传装车图片"
+          >
+            <el-option
+              v-for="item in Compulsoryoptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否干线上传发车图片">
+          <el-select
+            v-model="Expandconfigurationform.isTrunklineStartPhoto"
+            placeholder="请选择是否干线上传发车图片"
+          >
+            <el-option
+              v-for="item in Compulsoryoptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否干线上传卸车图片">
+          <el-select
+            v-model="Expandconfigurationform.isTrunklineUnloadPhoto"
+            placeholder="请选择是否干线上传卸车图片"
+          >
+            <el-option
+              v-for="item in Compulsoryoptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -1174,7 +1213,7 @@ const Expandconfiguration = async row => {
     let _res = await $_warehouseConfig(data);
   
     if (_res.data.code == 200) {
-      const { id, isStrictLoading, isAutoRelease,isAutoWarehouse,defaultAllocation} = _res.data.data;
+      const { id, isStrictLoading, isAutoRelease,isAutoWarehouse,defaultAllocation,isTrunklineLoadingPhoto,isTrunklineStartPhoto,isTrunklineUnloadPhoto} = _res.data.data;
       dialogExpandconfiguration.value = true;
       let form = Expandconfigurationform.value;
       form.id = id; //id
@@ -1182,6 +1221,10 @@ const Expandconfiguration = async row => {
       form.isAutoRelease = isAutoRelease; //是否自动释放
       form.isAutoWarehouse = isAutoWarehouse; //是否自动释放
       form.defaultAllocation = defaultAllocation; //库位名字
+      form.isTrunklineLoadingPhoto = isTrunklineLoadingPhoto;//是否干线上传装车图片
+      form.isTrunklineStartPhoto = isTrunklineStartPhoto;//是否干线上传发车图片
+      form.isTrunklineUnloadPhoto = isTrunklineUnloadPhoto;//是否干线上传卸车图片
+
       
     }
     console.log(_res, '_res');
@@ -1406,6 +1449,7 @@ const newlyaddSubmit = () => {
 }
 .el_Expandconfiguration {
   display: flex;
+  flex-wrap: wrap;
   .el-form-item {
     flex-direction: column;
     width: 20%;
diff --git a/src/views/finance/CustomerSettlement.vue b/src/views/finance/CustomerSettlement.vue
index 51fb0b1d..db50796a 100644
--- a/src/views/finance/CustomerSettlement.vue
+++ b/src/views/finance/CustomerSettlement.vue
@@ -92,6 +92,7 @@
         <div class="avue-crud__left">
           <!-- 导出 -->
           <!-- <el-button type="primary" icon="Download" @click="handleExport">导 出</el-button> -->
+          <el-button type="primary" @click="handleConfirmCustomerAll">批量确认结算</el-button>
         </div>
         <!-- 头部右侧按钮模块 -->
         <div class="avue-crud__right">
@@ -111,6 +112,7 @@
         @timeCheck="timesc"
         @selectCheck="selectsc"
         @selection="selectionChange"
+        :isselectfun="ProhibitSelection"
       >
         <template #default="slotProps">
           <template v-if="slotProps.scope.column.label === '操作'">
@@ -404,7 +406,13 @@ const handleExport = () => {
     });
   });
 };
-
+function ProhibitSelection(row, index) {
+  if (row.balanceStatusName == '已结算' || row.noBalanceFee !=0) {
+    return false;
+  } else {
+    return true;
+  }
+}
 /** 查看结算信息 */
 const ViewSettlementInformation = ({ row }) => {
   $router.push({
@@ -420,14 +428,23 @@ const ViewTransactionInformation = ({ row }) => {
     query: { balanceOrderInfoId: row.id, backPath: '/finance/CustomerSettlement' },
   });
 };
+const handleConfirmCustomerFU = rows => {
+  console.log(rows, 'rows');
 
-const handleConfirmCustomer = ({ row }) => {
-  ElMessageBox.confirm(`【 ${row.balanceOrderNo} 】 确认结算`, '提示', {
+  const ids = Array.isArray(rows) ? rows.map(row => row.id) : [rows.id];
+  const message = Array.isArray(rows)
+    ? `是否批量确认结算`
+    : `【 ${rows.balanceOrderNo} 】 确认结算`;
+
+  ElMessageBox.confirm(message, '提示', {
     type: 'warning',
   }).then(async () => {
     try {
       details.loadingObj.pageLoading = true;
-      const res = await postEnterBalance({ balanceOrderInfoId: row.id });
+      let data = {
+        balanceOrderInfoIds: ids,
+      };
+      const res = await postEnterBalance(data);
       const { code, msg } = res.data;
       if (code !== 200) return;
       msg && ElMessage.success(msg);
@@ -439,7 +456,20 @@ const handleConfirmCustomer = ({ row }) => {
     }
   });
 };
-
+const handleConfirmCustomer = ({ row }) => {
+  if (row.noBalanceFee != 0) {
+    ElMessage({
+      message: '待结算金额不为0，不能结算',
+      type: 'warning',
+    });
+    return;
+  }
+  handleConfirmCustomerFU(row);
+};
+// 批量确认结算
+const handleConfirmCustomerAll = () => {
+  handleConfirmCustomerFU(details.selectionList);
+};
 onActivated(() => {
   console.log('actived');
   onLoad();
diff --git a/src/views/wel/bulletinboard/bulletinboard.vue b/src/views/wel/bulletinboard/bulletinboard.vue
new file mode 100644
index 00000000..042d8099
--- /dev/null
+++ b/src/views/wel/bulletinboard/bulletinboard.vue
@@ -0,0 +1,296 @@
+<template>
+  <div class="el_top">
+    <div>
+      通知总数: <span>{{ announcements.length }}</span>
+    </div>
+    <el-button class="el_t_button" @click="toggleAnnouncements">公告栏</el-button>
+  </div>
+  <transition name="slide">
+    <div class="announcement-board" v-if="isShow">
+      <div class="announcement-content" v-loading="loading">
+        <div
+          class="announcement-item"
+          v-for="(item, index) in announcements"
+          :key="item.id"
+          @click="showDetails(item, index)"
+        >
+          <span v-if="isToday(item.releaseTime)" class="red-dot"></span>
+          <h2><span>标题：</span>{{ item.title }}</h2>
+          <p class="date">时间:{{ item.releaseTime }}</p>
+        </div>
+
+        <el-empty description="暂无公告通知" v-if="!announcements.length" />
+      </div>
+    </div>
+  </transition>
+  <el-dialog
+    v-model="centerDialogVisible"
+    :title="currentAnnouncement.title"
+    width="60%"
+    center
+    style="min-height: 500px"
+    class="el_announcement"
+  >
+    <p>
+      <span class="time">时间: {{ currentAnnouncement.releaseTime }}</span> <br />
+      <span class="category">分类：{{ currentAnnouncement.categoryName }}</span>
+    </p>
+    <div v-html="currentAnnouncement.content" class="content"></div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="Previous"
+          ><el-icon><DArrowLeft /></el-icon> 上一条
+        </el-button>
+        <el-button type="primary" @click="next"
+          >下一条<el-icon><DArrowRight /></el-icon>
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+<script setup>
+import { ref, computed } from 'vue';
+import { $_homeList } from '@/api/bulletinboard/index';
+
+const loading = ref(false);
+const centerDialogVisible = ref(false);
+const announcements = ref([]);
+
+const isShow = ref(true);
+const currentIndex = ref(null);
+const currentAnnouncement = ref({});
+
+// 计算当天日期
+const today = computed(() => {
+  const date = new Date();
+  return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(
+    date.getDate()
+  ).padStart(2, '0')}`;
+});
+
+// 检查日期是否为今天
+const isToday = releaseTime => {
+  const date = new Date(releaseTime);
+  return (
+    `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(
+      date.getDate()
+    ).padStart(2, '0')}` === today.value
+  );
+};
+
+// 页面初始化
+const onLoad = async () => {
+  try {
+    loading.value = true;
+    let res = await $_homeList();
+    const { code, data } = res.data;
+    if (code !== 200) {
+      return;
+    }
+    announcements.value = data;
+  } catch (e) {
+    console.log(e);
+  } finally {
+    loading.value = false;
+  }
+};
+
+onLoad();
+
+// 显示详情
+const showDetails = (item, index) => {
+  currentIndex.value = index;
+  currentAnnouncement.value = item;
+  centerDialogVisible.value = true;
+};
+
+// 切换下一条
+const next = () => {
+  if (currentIndex.value < announcements.value.length - 1) {
+    currentIndex.value += 1;
+    currentAnnouncement.value = announcements.value[currentIndex.value];
+  }
+};
+
+// 切换上一条
+const Previous = () => {
+  if (currentIndex.value > 0) {
+    currentIndex.value -= 1;
+    currentAnnouncement.value = announcements.value[currentIndex.value];
+  }
+};
+
+// 切换公告栏显示
+const toggleAnnouncements = () => {
+  isShow.value = !isShow.value;
+};
+</script>
+
+<style scoped lang="scss">
+/* 全局样式 */
+
+/* 顶部栏 */
+.el_top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  max-width: 600px;
+  margin: 0 auto;
+  padding: 10px 20px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  border-radius: 8px;
+  position: relative;
+
+  .el_t_button {
+    width: 120px;
+    height: 40px;
+    background-color: #172e60;
+    color: #fff;
+    border: none;
+    border-radius: 4px;
+    transition: background-color 0.3s ease;
+
+    &:hover {
+      background-color: #007bff;
+    }
+  }
+}
+
+/* 公告栏容器 */
+.announcement-board {
+  width: 100%;
+  max-width: 600px;
+  margin: 10px auto 0;
+  padding: 20px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  border-radius: 8px;
+  overflow: hidden;
+  position: relative;
+  .announcement-content {
+    padding: 0 10px;
+    height: 450px;
+    overflow-y: auto;
+  }
+
+  /* 公告条目 */
+  .announcement-item {
+    position: relative;
+    border-bottom: 1px solid #ddd;
+    padding: 10px;
+    margin-bottom: 15px;
+    transition: all 0.3s ease;
+    cursor: pointer;
+
+    .red-dot {
+      position: absolute;
+      top: 28%;
+      left: -10px;
+      transform: translateY(-50%);
+      width: 8px;
+      height: 8px;
+      background-color: red;
+      border-radius: 50%;
+    }
+
+    &:hover {
+      background-color: #f9f9f9;
+    }
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    h2 {
+      font-size: 18px;
+      color: #172e60;
+      margin: 0 0 10px;
+      font-family: 'Arial', sans-serif;
+      overflow: hidden; // 超出的文本隐藏
+      text-overflow: ellipsis; // 溢出用省略号显示
+      white-space: nowrap; // 溢出不换行
+    }
+
+    .content {
+      display: flex;
+      align-items: center;
+      p {
+        font-size: 14px;
+        color: #555;
+        margin: 0;
+        line-height: 1.5;
+        font-family: 'Arial', sans-serif;
+        overflow: hidden; // 超出的文本隐藏
+        text-overflow: ellipsis; // 溢出用省略号显示
+        white-space: nowrap; // 溢出不换行
+      }
+    }
+    .date {
+      font-size: 12px;
+      color: #999;
+      margin-top: 5px;
+      font-family: 'Arial', sans-serif;
+    }
+  }
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .el_top,
+  .announcement-board {
+    width: 90%;
+  }
+
+  .announcement-board {
+    .announcement-item {
+      h2 {
+        font-size: 16px;
+      }
+
+      p {
+        font-size: 12px;
+      }
+
+      .date {
+        font-size: 10px;
+      }
+    }
+  }
+}
+
+/* 过渡动画 */
+.slide-enter-active,
+.slide-leave-active {
+  transition: opacity 0.3s ease, transform 0.3s ease;
+  transform-origin: top;
+}
+
+.slide-enter-from,
+.slide-leave-to {
+  opacity: 0;
+  transform: scaleY(0);
+}
+
+.el-dialog {
+  min-height: 500px !important;
+}
+
+.dialog-footer {
+  position: absolute;
+  bottom: 30px;
+  left: 50%;
+  width: 49%;
+  display: flex;
+  justify-content: space-evenly;
+  transform: translate(-56%, 0);
+  button {
+    width: 150px;
+    height: 50px;
+    margin: 0;
+  }
+}
+</style>
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index bb0ec2e7..56153314 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="el_Hwlogo">
+    <div class="el_bulletinboard">
+      <bulletinboard> </bulletinboard>
+    </div>
     <div class="content">
       <img src="/public/img/p-logo.png" alt="" />
       <div class="info">
@@ -11,9 +14,17 @@
     </div>
   </div>
 </template>
-<script setup lang="ts">
-import { ref, onUnmounted } from 'vue';
-
+<script>
+// 缓存要引入当前页面地址
+export default {
+  name: '/wel/index',
+};
+</script>
+<script setup>
+import { ref, onUnmounted, defineAsyncComponent } from 'vue';
+const bulletinboard = defineAsyncComponent(() =>
+  import('@/views/wel/bulletinboard/bulletinboard.vue')
+);
 const info = localStorage.getItem('TWMS-userInfo');
 
 const _userInfo = info ? JSON.parse(info) : {};
@@ -91,6 +102,7 @@ onUnmounted(() => {
   display: flex;
   align-items: center;
   justify-content: center;
+  position: relative;
   span {
     color: #d3832a;
   }
@@ -138,4 +150,32 @@ onUnmounted(() => {
 #avue-view {
   background-color: #fff;
 }
+.el_bulletinboard {
+  width: 18%;
+  position: absolute;
+  top: 0;
+  right: 40px;
+  z-index: 999;
+}
+.el_announcement {
+  .time {
+    font-size: 16px;
+    font-weight: bold;
+
+  }
+  .category {
+    font-size: 16px;
+    font-weight: bold;
+  }
+  .content {
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    min-height: 300px;
+    padding: 4px 20px;
+  }
+  .el-dialog__body {
+    height: 558px;
+    overflow-y: scroll;
+  }
+}
 </style>

From 466067ae6376047fb9c57de4f98e4b669d438cb3 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 11 Dec 2024 19:45:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F,=E6=96=B0=E5=A2=9E=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A0,=E6=96=B0=E5=A2=9E=E6=94=B6=E8=8E=B7?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=94=B6=E5=85=A5=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/VehicleArrivalManagement.js  |  33 +
 src/option/distribution/OrderInTransit.js     |  19 +
 src/option/distribution/addVehicleStowage.js  |  19 +
 src/option/reportforms/ConsigneeReport.js     |  66 +-
 .../SalesDepartmentIncomeReport.js            |  66 +-
 src/views/desk/DataBoard.vue                  | 422 +++++++----
 .../distribution/artery/AddVehicleStowage.vue |  11 +-
 .../distribution/artery/VehicleNodeImgs.vue   | 677 +++++++++++++++---
 .../distribution/artery/VehicleStowage.vue    |  10 +
 .../artery/addTripartiteTransfer.vue          |  10 +-
 .../signfor/distributionSignfortreat.vue      |  46 +-
 src/views/reportforms/ConsigneeReport.vue     |   2 +-
 .../SalesDepartmentIncomeReport.vue           |   2 +-
 13 files changed, 1060 insertions(+), 323 deletions(-)

diff --git a/src/api/distribution/VehicleArrivalManagement.js b/src/api/distribution/VehicleArrivalManagement.js
index c476b8cb..25c59935 100644
--- a/src/api/distribution/VehicleArrivalManagement.js
+++ b/src/api/distribution/VehicleArrivalManagement.js
@@ -81,6 +81,39 @@ export const postFindLinePhoto = data => {
   });
 };
 
+/**
+ * 编辑配载图片 -- 装车前
+ */
+export const postUploadLoadingPhoto = data => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/uploadLoadingPhoto',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 编辑配载图片 -- 发车前
+ */
+export const postUploadStartPhoto = data => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/uploadStartPhoto',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 编辑配载图片 -- 卸车前
+ */
+export const postUploadUnloadPhoto = data => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/uploadUnloadPhoto',
+    method: 'post',
+    data,
+  });
+};
+
 /**
  * 到车数据导出
  */
diff --git a/src/option/distribution/OrderInTransit.js b/src/option/distribution/OrderInTransit.js
index d598eabb..16aab4af 100644
--- a/src/option/distribution/OrderInTransit.js
+++ b/src/option/distribution/OrderInTransit.js
@@ -201,6 +201,25 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
+  {
+    prop: 'isTimeOutName',
+    label: '是否超时',
+    type: 3,
+    values: '',
+    width: '100',
+    checkarr: [
+      {
+        value: '0',
+        label: '否',
+      },
+      {
+        value: '1',
+        label: '是',
+      },
+    ],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'warehouse',
     label: '所在仓库',
diff --git a/src/option/distribution/addVehicleStowage.js b/src/option/distribution/addVehicleStowage.js
index 454b5175..4e4723c5 100644
--- a/src/option/distribution/addVehicleStowage.js
+++ b/src/option/distribution/addVehicleStowage.js
@@ -260,6 +260,25 @@ export const columnList = [
     isColumnMerge: true,
     sortable: true,
   },
+  {
+    prop: 'isTimeOutName',
+    label: '是否超时',
+    type: 3,
+    values: '',
+    width: '100',
+    checkarr: [
+      {
+        value: 0,
+        label: '否',
+      },
+      {
+        value: 1,
+        label: '是',
+      },
+    ],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'goodsName',
     label: '品类名称',
diff --git a/src/option/reportforms/ConsigneeReport.js b/src/option/reportforms/ConsigneeReport.js
index be309c6b..041dd83d 100644
--- a/src/option/reportforms/ConsigneeReport.js
+++ b/src/option/reportforms/ConsigneeReport.js
@@ -70,8 +70,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'waybillNum',
-    label: '运单数',
+    prop: 'nian',
+    label: '年',
     type: 1,
     values: '',
     width: '150',
@@ -79,11 +79,10 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true, //开启统计
   },
   {
-    prop: 'num',
-    label: '件数',
+    prop: 'yue',
+    label: '月',
     type: 1,
     values: '',
     width: '150',
@@ -91,23 +90,21 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true, //开启统计
   },
   {
-    prop: 'weight',
-    label: '重量',
+    prop: 'timeStr',
+    label: '制单时间',
     type: 1,
     values: '',
-    width: '200',
+    width: '150',
     checkarr: [],
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true, //开启统计
   },
   {
-    prop: 'volume',
-    label: '体积',
+    prop: 'waybillNum',
+    label: '运单数',
     type: 1,
     values: '',
     width: '150',
@@ -118,8 +115,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'stockNum',
-    label: '到货件数',
+    prop: 'num',
+    label: '件数',
     type: 1,
     values: '',
     width: '150',
@@ -130,11 +127,11 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'signNum',
-    label: '签收件数',
+    prop: 'weight',
+    label: '重量',
     type: 1,
     values: '',
-    width: '150',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -142,8 +139,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'pickupFee',
-    label: '提货费',
+    prop: 'volume',
+    label: '体积',
     type: 1,
     values: '',
     width: '150',
@@ -154,8 +151,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'freightFee',
-    label: '运费',
+    prop: 'stockNum',
+    label: '到货件数',
     type: 1,
     values: '',
     width: '150',
@@ -166,8 +163,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'deliveryFee',
-    label: '送货费',
+    prop: 'signNum',
+    label: '签收件数',
     type: 1,
     values: '',
     width: '150',
@@ -178,8 +175,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'warehouseManagementFee',
-    label: '仓库管理费',
+    prop: 'pickupFee',
+    label: '提货费',
     type: 1,
     values: '',
     width: '150',
@@ -190,8 +187,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'storageFee',
-    label: '仓储费',
+    prop: 'freightFee',
+    label: '运费',
     type: 1,
     values: '',
     width: '150',
@@ -202,8 +199,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'nian',
-    label: '年',
+    prop: 'deliveryFee',
+    label: '送货费',
     type: 1,
     values: '',
     width: '150',
@@ -211,10 +208,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true, //开启统计
   },
   {
-    prop: 'yue',
-    label: '月',
+    prop: 'warehouseManagementFee',
+    label: '仓库管理费',
     type: 1,
     values: '',
     width: '150',
@@ -222,10 +220,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true, //开启统计
   },
   {
-    prop: 'timeStr',
-    label: '时间周期',
+    prop: 'storageFee',
+    label: '仓储费',
     type: 1,
     values: '',
     width: '150',
@@ -233,6 +232,7 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true, //开启统计
   },
   {
     prop: 'handlingFee',
diff --git a/src/option/reportforms/SalesDepartmentIncomeReport.js b/src/option/reportforms/SalesDepartmentIncomeReport.js
index bab766bf..cfe3633f 100644
--- a/src/option/reportforms/SalesDepartmentIncomeReport.js
+++ b/src/option/reportforms/SalesDepartmentIncomeReport.js
@@ -59,8 +59,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'waybillNum',
-    label: '运单数',
+    prop: 'nian',
+    label: '年',
     type: 1,
     values: '',
     width: '150',
@@ -68,11 +68,10 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true, //开启统计
   },
   {
-    prop: 'num',
-    label: '件数',
+    prop: 'yue',
+    label: '月',
     type: 1,
     values: '',
     width: '150',
@@ -80,23 +79,21 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true, //开启统计
   },
   {
-    prop: 'weight',
-    label: '重量',
+    prop: 'timeStr',
+    label: '制单时间',
     type: 1,
     values: '',
-    width: '200',
+    width: '150',
     checkarr: [],
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true, //开启统计
   },
   {
-    prop: 'volume',
-    label: '体积',
+    prop: 'waybillNum',
+    label: '运单数',
     type: 1,
     values: '',
     width: '150',
@@ -107,8 +104,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'stockNum',
-    label: '到货件数',
+    prop: 'num',
+    label: '件数',
     type: 1,
     values: '',
     width: '150',
@@ -119,11 +116,11 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'signNum',
-    label: '签收件数',
+    prop: 'weight',
+    label: '重量',
     type: 1,
     values: '',
-    width: '150',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -131,8 +128,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'pickupFee',
-    label: '提货费',
+    prop: 'volume',
+    label: '体积',
     type: 1,
     values: '',
     width: '150',
@@ -143,8 +140,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'freightFee',
-    label: '运费',
+    prop: 'stockNum',
+    label: '到货件数',
     type: 1,
     values: '',
     width: '150',
@@ -155,8 +152,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'deliveryFee',
-    label: '送货费',
+    prop: 'signNum',
+    label: '签收件数',
     type: 1,
     values: '',
     width: '150',
@@ -167,8 +164,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'warehouseManagementFee',
-    label: '仓库管理费',
+    prop: 'pickupFee',
+    label: '提货费',
     type: 1,
     values: '',
     width: '150',
@@ -179,8 +176,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'storageFee',
-    label: '仓储费',
+    prop: 'freightFee',
+    label: '运费',
     type: 1,
     values: '',
     width: '150',
@@ -191,8 +188,8 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'nian',
-    label: '年',
+    prop: 'deliveryFee',
+    label: '送货费',
     type: 1,
     values: '',
     width: '150',
@@ -200,10 +197,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true, //开启统计
   },
   {
-    prop: 'yue',
-    label: '月',
+    prop: 'warehouseManagementFee',
+    label: '仓库管理费',
     type: 1,
     values: '',
     width: '150',
@@ -211,10 +209,11 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true, //开启统计
   },
   {
-    prop: 'timeStr',
-    label: '时间周期',
+    prop: 'storageFee',
+    label: '仓储费',
     type: 1,
     values: '',
     width: '150',
@@ -222,6 +221,7 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true, //开启统计
   },
   {
     prop: 'handlingFee',
diff --git a/src/views/desk/DataBoard.vue b/src/views/desk/DataBoard.vue
index b1c27495..b86d8ec1 100644
--- a/src/views/desk/DataBoard.vue
+++ b/src/views/desk/DataBoard.vue
@@ -164,8 +164,19 @@
                   <div>总计</div>
                 </div>
 
-                <div class="align_center">
-                  <span class="data mr10">{{ details.openOrderIncomeInfo.totalFee || 0 }}</span>
+                <div
+                  class="align_center"
+                  @click="
+                    () =>
+                      handleDetails('openOrderIncomeInfo', '开单数据详情 - 总计 - 元', {
+                        tip: '总计',
+                        prop: 'totalFee',
+                      })
+                  "
+                >
+                  <span class="data mr10 underline">{{
+                    details.openOrderIncomeInfo.totalFee || 0
+                  }}</span>
                   <span>元</span>
                 </div>
               </div>
@@ -179,8 +190,19 @@
                     <div>当月</div>
                   </div>
 
-                  <div class="align_center">
-                    <span class="data mr10">{{ details.openOrderIncomeInfo.monthFee || 0 }}</span>
+                  <div
+                    class="align_center"
+                    @click="
+                      () =>
+                        handleDetails('openOrderIncomeInfo', '开单数据详情 - 当月 - 元', {
+                          tip: '当月',
+                          prop: 'monthFee',
+                        })
+                    "
+                  >
+                    <span class="data mr10 underline">{{
+                      details.openOrderIncomeInfo.monthFee || 0
+                    }}</span>
                     <span>元</span>
                   </div>
                 </div>
@@ -193,8 +215,19 @@
                     <div>当日</div>
                   </div>
 
-                  <div class="align_center">
-                    <span class="data mr10">{{ details.openOrderIncomeInfo.dayFee || 0 }}</span>
+                  <div
+                    class="align_center"
+                    @click="
+                      () =>
+                        handleDetails('openOrderIncomeInfo', '开单数据详情 - 当日 - 元', {
+                          tip: '当日',
+                          prop: 'dayFee',
+                        })
+                    "
+                  >
+                    <span class="data mr10 underline">{{
+                      details.openOrderIncomeInfo.dayFee || 0
+                    }}</span>
                     <span>元</span>
                   </div>
                 </div>
@@ -206,9 +239,18 @@
               <!-- 月 -->
               <div class="flex-c-sb">
                 <!-- 干线 -->
-                <div class="item flex1 mr10">
+                <div
+                  class="item flex1 mr10"
+                  @click="
+                    () =>
+                      handleDetails('openOrderIncomeInfo', '开单数据详情 - 干线 - 月 - 元', {
+                        tip: '干线 - 月',
+                        prop: 'monthTrunklineFee',
+                      })
+                  "
+                >
                   <div>
-                    <span class="data mr5px">{{
+                    <span class="data mr5px underline">{{
                       details.openOrderIncomeInfo.monthTrunklineFee || 0
                     }}</span>
                     <span>元</span>
@@ -217,9 +259,18 @@
                   <div>干线 - 月</div>
                 </div>
                 <!-- 仓储 -->
-                <div class="item flex1 mr10">
+                <div
+                  class="item flex1 mr10"
+                  @click="
+                    () =>
+                      handleDetails('openOrderIncomeInfo', '开单数据详情 - 仓储 - 月 - 元', {
+                        tip: '仓储 - 月',
+                        prop: 'monthWarehouseFee',
+                      })
+                  "
+                >
                   <div>
-                    <span class="data mr5px">{{
+                    <span class="data mr5px underline">{{
                       details.openOrderIncomeInfo.monthWarehouseFee || 0
                     }}</span>
                     <span>元</span>
@@ -228,9 +279,18 @@
                   <div>仓储 - 月</div>
                 </div>
                 <!-- 配送 -->
-                <div class="item flex1 mr10">
+                <div
+                  class="item flex1 mr10"
+                  @click="
+                    () =>
+                      handleDetails('openOrderIncomeInfo', '开单数据详情 - 配送 - 月 - 元', {
+                        tip: '配送 - 月',
+                        prop: 'monthDistributionFee',
+                      })
+                  "
+                >
                   <div>
-                    <span class="data mr5px">{{
+                    <span class="data mr5px underline">{{
                       details.openOrderIncomeInfo.monthDistributionFee || 0
                     }}</span>
                     <span>元</span>
@@ -239,9 +299,18 @@
                   <div>配送 - 月</div>
                 </div>
                 <!-- 提货 -->
-                <div class="item flex1 mr10">
+                <div
+                  class="item flex1 mr10"
+                  @click="
+                    () =>
+                      handleDetails('openOrderIncomeInfo', '开单数据详情 - 提货 - 月 - 元', {
+                        tip: '提货 - 月',
+                        prop: 'monthBillladingFee',
+                      })
+                  "
+                >
                   <div>
-                    <span class="data mr5px">{{
+                    <span class="data mr5px underline">{{
                       details.openOrderIncomeInfo.monthBillladingFee || 0
                     }}</span>
                     <span>元</span>
@@ -250,9 +319,18 @@
                   <div>提货 - 月</div>
                 </div>
                 <!-- 安装 -->
-                <div class="item flex1">
+                <div
+                  class="item flex1"
+                  @click="
+                    () =>
+                      handleDetails('openOrderIncomeInfo', '开单数据详情 - 安装 - 月 - 元', {
+                        tip: '安装 - 月',
+                        prop: 'monthInstallFee',
+                      })
+                  "
+                >
                   <div>
-                    <span class="data mr5px">{{
+                    <span class="data mr5px underline">{{
                       details.openOrderIncomeInfo.monthInstallFee || 0
                     }}</span>
                     <span>元</span>
@@ -265,9 +343,18 @@
               <!-- 日 -->
               <div class="flex-c-sb mt10">
                 <!-- 干线 -->
-                <div class="item flex1 mr10">
+                <div
+                  class="item flex1 mr10"
+                  @click="
+                    () =>
+                      handleDetails('openOrderIncomeInfo', '开单数据详情 - 干线 - 日 - 元', {
+                        tip: '干线 - 日',
+                        prop: 'dayTrunklineFee',
+                      })
+                  "
+                >
                   <div>
-                    <span class="data mr5px">{{
+                    <span class="data mr5px underline">{{
                       details.openOrderIncomeInfo.dayTrunklineFee || 0
                     }}</span>
                     <span>元</span>
@@ -276,9 +363,18 @@
                   <div>干线 - 日</div>
                 </div>
                 <!-- 仓储 -->
-                <div class="item flex1 mr10">
+                <div
+                  class="item flex1 mr10"
+                  @click="
+                    () =>
+                      handleDetails('openOrderIncomeInfo', '开单数据详情 - 仓储 - 日 - 元', {
+                        tip: '仓储 - 日',
+                        prop: 'dayWarehouseFee',
+                      })
+                  "
+                >
                   <div>
-                    <span class="data mr5px">{{
+                    <span class="data mr5px underline">{{
                       details.openOrderIncomeInfo.dayWarehouseFee || 0
                     }}</span>
                     <span>元</span>
@@ -287,9 +383,18 @@
                   <div>仓储 - 日</div>
                 </div>
                 <!-- 配送 -->
-                <div class="item flex1 mr10">
+                <div
+                  class="item flex1 mr10"
+                  @click="
+                    () =>
+                      handleDetails('openOrderIncomeInfo', '开单数据详情 - 配送 - 日 - 元', {
+                        tip: '配送 - 日',
+                        prop: 'dayDistributionFee',
+                      })
+                  "
+                >
                   <div>
-                    <span class="data mr5px">{{
+                    <span class="data mr5px underline">{{
                       details.openOrderIncomeInfo.dayDistributionFee || 0
                     }}</span>
                     <span>元</span>
@@ -298,9 +403,18 @@
                   <div>配送 - 日</div>
                 </div>
                 <!-- 提货 -->
-                <div class="item flex1 mr10">
+                <div
+                  class="item flex1 mr10"
+                  @click="
+                    () =>
+                      handleDetails('openOrderIncomeInfo', '开单数据详情 - 提货 - 日 - 元', {
+                        tip: '提货 - 日',
+                        prop: 'dayBillladingFee',
+                      })
+                  "
+                >
                   <div>
-                    <span class="data mr5px">{{
+                    <span class="data mr5px underline">{{
                       details.openOrderIncomeInfo.dayBillladingFee || 0
                     }}</span>
                     <span>元</span>
@@ -309,9 +423,18 @@
                   <div>提货 - 日</div>
                 </div>
                 <!-- 安装 -->
-                <div class="item flex1">
+                <div
+                  class="item flex1"
+                  @click="
+                    () =>
+                      handleDetails('openOrderIncomeInfo', '开单数据详情 - 安装 -  - 元', {
+                        tip: '安装 - ',
+                        prop: 'dayInstallFee',
+                      })
+                  "
+                >
                   <div>
-                    <span class="data mr5px">{{
+                    <span class="data mr5px underline">{{
                       details.openOrderIncomeInfo.dayInstallFee || 0
                     }}</span>
                     <span>元</span>
@@ -629,9 +752,22 @@
 
           <!-- 数据 -->
           <div class="border pd10 flex-c-sb">
-            <div class="text_center">
+            <div
+              class="text_center"
+              @click="
+                () =>
+                  handleDetails(
+                    'trunklineHandOrderDataInfo',
+                    '干线待发运在库数据 - 运单总数 - 单',
+                    {
+                      tip: '运单总数',
+                      prop: 'waybillNum',
+                    }
+                  )
+              "
+            >
               <div class="data_box orange mb10">
-                <div class="data mr5px">
+                <div class="data mr5px underline">
                   {{ details.trunklineHandOrderDataInfo.waybillNum || 0 }}
                 </div>
                 <div class="">单</div>
@@ -641,9 +777,22 @@
               </div>
             </div>
 
-            <div class="text_center">
+            <div
+              class="text_center"
+              @click="
+                () =>
+                  handleDetails(
+                    'trunklineHandOrderDataInfo',
+                    '干线待发运在库数据 - 在库总件数 - 件',
+                    {
+                      tip: '在库总件数',
+                      prop: 'handleNum',
+                    }
+                  )
+              "
+            >
               <div class="data_box orange mb10">
-                <div class="data mr5px">
+                <div class="data mr5px underline">
                   {{ details.trunklineHandOrderDataInfo.handleNum || 0 }}
                 </div>
                 <div class="">件</div>
@@ -653,9 +802,22 @@
               </div>
             </div>
 
-            <div class="text_center">
+            <div
+              class="text_center"
+              @click="
+                () =>
+                  handleDetails(
+                    'trunklineHandOrderDataInfo',
+                    '干线待发运在库数据 - 在库总重量 - kg',
+                    {
+                      tip: '在库总重量',
+                      prop: 'handleWeight',
+                    }
+                  )
+              "
+            >
               <div class="data_box orange mb10">
-                <div class="data mr5px">
+                <div class="data mr5px underline">
                   {{ details.trunklineHandOrderDataInfo.handleWeight || 0 }}
                 </div>
                 <div class="">kg</div>
@@ -665,9 +827,22 @@
               </div>
             </div>
 
-            <div class="text_center">
+            <div
+              class="text_center"
+              @click="
+                () =>
+                  handleDetails(
+                    'trunklineHandOrderDataInfo',
+                    '干线待发运在库数据 - 在库总方数 - m³',
+                    {
+                      tip: '在库总方数',
+                      prop: 'handleVolume',
+                    }
+                  )
+              "
+            >
               <div class="data_box orange mb10">
-                <div class="data mr5px">
+                <div class="data mr5px underline">
                   {{ details.trunklineHandOrderDataInfo.handleVolume || 0 }}
                 </div>
                 <div class="">m³</div>
@@ -1842,15 +2017,51 @@ const initOpenOrderData = async () => {
 
 /** 请求开单收入 */
 const initOpenOrderIncome = async () => {
+  const _obj: any = {};
+  const _keyArr = [
+    'totalFee',
+    'monthFee',
+    'dayFee',
+    'monthTrunklineFee',
+    'monthWarehouseFee',
+    'monthDistributionFee',
+    'monthBillladingFee',
+    'monthInstallFee',
+    'dayTrunklineFee',
+    'dayWarehouseFee',
+    'dayDistributionFee',
+    'dayBillladingFee',
+    'dayInstallFee',
+  ];
+  for (let i = 0; i < _keyArr.length; i++) {
+    const value = _keyArr[i];
+
+    _obj[value] = 0;
+  }
+  _obj.list = [];
+
   try {
     details.loadingObj.openOrderIncome = true;
     const res = await postOpenOrderIncome({});
     const { code, data } = res.data;
     if (code !== 200) return;
-    details.openOrderIncomeInfo = data || {};
+
+    for (let i = 0; i < data.length; i++) {
+      const value = data[i];
+
+      for (let i = 0; i < _keyArr.length; i++) {
+        const key = _keyArr[i];
+        value[key] = isNumber(value[key]) ? Number(value[key]) : 0;
+
+        _obj[key] = computeNumber(_obj[key], '+', value[key]).result;
+      }
+
+      _obj.list.push(value);
+    }
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
+    details.openOrderIncomeInfo = _obj;
     details.loadingObj.openOrderIncome = false;
   }
 };
@@ -1887,15 +2098,37 @@ const initHandOrderData = async () => {
 
 /** 请求干线发运数据 */
 const initTrunklineHandOrderData = async () => {
+  const _obj: any = {};
+  const _keyArr = ['waybillNum', 'handleNum', 'handleWeight', 'handleVolume'];
+  for (let i = 0; i < _keyArr.length; i++) {
+    const value = _keyArr[i];
+
+    _obj[value] = 0;
+  }
+  _obj.list = [];
+
   try {
     details.loadingObj.trunklineHandOrderData = true;
     const res = await postTrunklineHandOrderData({});
     const { code, data } = res.data;
     if (code !== 200) return;
-    details.trunklineHandOrderDataInfo = data || {};
+
+    for (let i = 0; i < data.length; i++) {
+      const value = data[i];
+
+      for (let i = 0; i < _keyArr.length; i++) {
+        const key = _keyArr[i];
+        value[key] = isNumber(value[key]) ? Number(value[key]) : 0;
+
+        _obj[key] = computeNumber(_obj[key], '+', value[key]).result;
+      }
+
+      _obj.list.push(value);
+    }
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
+    details.trunklineHandOrderDataInfo = _obj;
     details.loadingObj.trunklineHandOrderData = false;
   }
 };
@@ -2431,117 +2664,13 @@ 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) => {
   if (!isNumber(value)) return '0%';
   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[],
@@ -2721,6 +2850,11 @@ const handleDetails = async (type, title, optionObj: OptionObjType) => {
         res = await postOpenOrderDataByWarehouseId({});
         break;
 
+      // 开单收入
+      case 'openOrderIncomeInfo':
+        handleShowEcharts(details.openOrderIncomeInfo.list, title, optionObj);
+        break;
+
       // 库位数据
       case 'allocationDataColumn':
         res = await postAllocationDataByWarehouseId({});
@@ -2731,6 +2865,10 @@ const handleDetails = async (type, title, optionObj: OptionObjType) => {
         res = await postHandOrderDataByWarehouseId({});
         break;
 
+      case 'trunklineHandOrderDataInfo':
+        handleShowEcharts(details.trunklineHandOrderDataInfo.list, title, optionObj);
+        break;
+
       // 干线车次数据
       case 'trunklineCarsDataColumn':
         handleShowEcharts(details.trunklineCarsDataInfo.list, title, optionObj);
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index e7fb4bd8..2b8480bb 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -423,6 +423,7 @@
                 :columnList="details.columnList"
                 :tableData="details.data"
                 @inputTxt="inputsc"
+                @selectCheck="selectsc"
                 :loading="loadingObj.oldListLoading"
                 @selection="selectionChange"
                 :tableRowClassName="handleSetRowClassName"
@@ -815,6 +816,8 @@ import {
   debounce,
   handleClearTableQuery,
   getObjType,
+  handleSelectQuery,
+  handleTranslationDataSeclect,
 } from '@/utils/util';
 import {
   columnList,
@@ -1155,6 +1158,7 @@ const initOriginWarehouseOrder = debounce(async (params = {}) => {
     const { code, data } = res.data;
     if (code !== 200) return;
     details.data = data.records;
+    handleTranslationDataSeclect(details.data, details.columnList);
     details.page.total = data.total;
   } catch (error) {
     console.log('error :>> ', error);
@@ -1560,12 +1564,7 @@ const btnsc = () => {};
 
 /** 表格表头下拉框选择 */
 const selectsc = (index, row) => {
-  details.query[row.prop] = index;
-  if (!index && index !== 0) delete details.query[row.prop];
-  if (row.prop === 'certificateTypeName') {
-    details.query['certificateType'] = index;
-    if (!index) delete details.query['certificateType'];
-  }
+  handleSelectQuery(index, row, details.query);
   initOriginWarehouseOrder();
 };
 
diff --git a/src/views/distribution/artery/VehicleNodeImgs.vue b/src/views/distribution/artery/VehicleNodeImgs.vue
index 0195d700..21d9f4d8 100644
--- a/src/views/distribution/artery/VehicleNodeImgs.vue
+++ b/src/views/distribution/artery/VehicleNodeImgs.vue
@@ -6,33 +6,24 @@
 
       <div class="VehicleLineImgs_line">
         <div
+          v-for="(item, index) in details.loadLineArr"
+          :key="item.nodeId"
           :class="{
             VehicleLineNode_item: true,
             notActive: false,
-            choose: false,
-          }"
-        >
-          <div class="VehicleLineNode_item_container">
-            <!-- <el-icon size="20px" color=""><Box /></el-icon> -->
-            <el-icon size="20px"><CircleCheck /></el-icon>
-            <span class="VehicleLineNode_item_title">龙泉仓</span>
-          </div>
-
-          <el-icon><ArrowRight /></el-icon>
-        </div>
-
-        <div
-          :class="{
-            VehicleLineNode_item: true,
-            notActive: false,
-            choose: true,
+            choose: details.activeIndex === index,
           }"
+          @click="() => handleCheckNode(item, index)"
         >
           <div class="VehicleLineNode_item_container">
             <el-icon size="20px" color=""><Box /></el-icon>
 
-            <span class="VehicleLineNode_item_title">龙泉仓</span>
+            <span class="VehicleLineNode_item_title">{{ item.nodeName }}</span>
           </div>
+
+          <template v-if="index !== details.loadLineArr.length - 1">
+            <el-icon><ArrowRight /></el-icon>
+          </template>
         </div>
       </div>
 
@@ -43,10 +34,20 @@
 
       <!-- 图片容器 -->
       <div class="VehicleLineImgs_container">
-        <div class="VehicleLineImgs_container_title">发车前图片</div>
+        <div class="mb20 align-center">
+          <div class="VehicleLineImgs_container_title">装车前图片</div>
+
+          <el-button
+            type="primary"
+            icon="edit"
+            @click="() => handleEdit('beforeLoad', beforeLoadImgArr, '装车前图片')"
+          >
+            编辑
+          </el-button>
+        </div>
         <div
-          class="VehicleLineImgs_container_list"
-          v-for="(item, index) in details.beforeLoadImgArr"
+          class="VehicleLineImgs_container_list mb20"
+          v-for="(item, index) in beforeLoadImgArr"
           :key="item.type + '-' + item.position"
         >
           <div class="title">{{ item.title }}</div>
@@ -61,24 +62,146 @@
               :max-scale="7"
               :min-scale="0.2"
               :preview-src-list="item.imgArr.map(val => val.url)"
-              :initial-index="index"
+              :initial-index="i"
               fit="cover"
             />
           </div>
         </div>
 
-        <div class="VehicleLineImgs_container_title">发车前图片</div>
-        <div class="VehicleLineImgs_container_list">
-          <div class="VehicleLineImgs_container_list_item"></div>
+        <div class="mb20 align-center">
+          <div class="VehicleLineImgs_container_title">发车前图片</div>
+
+          <el-button
+            type="primary"
+            icon="edit"
+            @click="() => handleEdit('boforeStart', boforeStartImgArr, '发车前图片')"
+          >
+            编辑
+          </el-button>
         </div>
+        <div
+          class="VehicleLineImgs_container_list mb20"
+          v-for="(item, index) in boforeStartImgArr"
+          :key="item.type + '-' + item.position"
+        >
+          <div class="title">{{ item.title }}</div>
 
-        <div class="VehicleLineImgs_container_title">发车前图片</div>
-        <div class="VehicleLineImgs_container_list">
-          <div class="VehicleLineImgs_container_list_item"></div>
+          <div class="item">
+            <el-image
+              v-for="(value, i) in item.imgArr"
+              :key="value.url"
+              style="width: 150px; height: 150px; margin: 5px; border-radius: 5px"
+              :src="value.url"
+              :zoom-rate="1.2"
+              :max-scale="7"
+              :min-scale="0.2"
+              :preview-src-list="item.imgArr.map(val => val.url)"
+              :initial-index="i"
+              fit="cover"
+            />
+          </div>
         </div>
+
+        <template v-if="details.activeIndex !== 0">
+          <div class="mb20 align-center">
+            <div class="VehicleLineImgs_container_title">卸车前图片</div>
+
+            <el-button
+              type="primary"
+              icon="edit"
+              @click="() => handleEdit('beforeUnload', beforeUnloadImgArr, '卸车前图片')"
+            >
+              编辑
+            </el-button>
+          </div>
+          <div
+            class="VehicleLineImgs_container_list mb20"
+            v-for="(item, index) in beforeUnloadImgArr"
+            :key="item.type + '-' + item.position"
+          >
+            <div class="title">{{ item.title }}</div>
+
+            <div class="item">
+              <el-image
+                v-for="(value, i) in item.imgArr"
+                :key="value.url"
+                style="width: 150px; height: 150px; margin: 5px; border-radius: 5px"
+                :src="value.url"
+                :zoom-rate="1.2"
+                :max-scale="7"
+                :min-scale="0.2"
+                :preview-src-list="item.imgArr.map(val => val.url)"
+                :initial-index="i"
+                fit="cover"
+              />
+            </div>
+          </div>
+        </template>
       </div>
     </div>
   </basic-container>
+
+  <!-- 编辑图片 -->
+  <el-dialog v-model="details.popUpShow.editImg" :title="details.title" width="70%">
+    <div v-loading="details.loadingObj.imgEdit">
+      <div
+        class="VehicleLineImgs_container_list mb20"
+        v-for="(item, index) in details.editFormList"
+        :key="item.type + '-' + item.position"
+      >
+        <div class="title">{{ item.title }}</div>
+
+        <div class="item">
+          <div class="imgBox" v-for="(value, i) in item.imgArr" :key="value.url">
+            <el-image
+              style="width: 150px; height: 150px; margin: 5px; border-radius: 5px"
+              :src="value.url"
+              v-loading="!value.imgUrl"
+              :zoom-rate="1.2"
+              :max-scale="7"
+              :min-scale="0.2"
+              :preview-src-list="item.imgArr.map(val => val.url)"
+              :initial-index="i"
+              fit="cover"
+            />
+
+            <div class="remove" @click="() => item.imgArr.splice(i, 1)">
+              <el-icon size="16" color="#f00"><DeleteFilled /></el-icon>
+            </div>
+          </div>
+
+          <div class="add">
+            <el-upload
+              list-type="picture-card"
+              v-model:file-list="item.imgArr"
+              :show-file-list="false"
+              :action="'/api/blade-resource/oss/endpoint/put-file'"
+              :on-success="file => handleUpLoadSuccess(file, item)"
+              :before-upload="file => handleBeforeUpload(file, item)"
+              multiple
+              :headers="details.headers"
+            >
+              <el-icon class="avatar-uploader-icon"><Plus /></el-icon>
+            </el-upload>
+          </div>
+        </div>
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="details.popUpShow.editImg = false" icon="CircleClose">关闭</el-button>
+
+        <el-button
+          type="primary"
+          :loading="details.loadingObj.imgEdit"
+          icon="Position"
+          @click="handleEditSubmit"
+        >
+          提交
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
@@ -86,60 +209,160 @@ import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
 import { deepClone, getObjType, ChecksWhetherTheWarehouseIsSelected } from '@/utils/util';
-import { postFindLinePhoto } from '@/api/distribution/VehicleArrivalManagement';
+import {
+  postFindLinePhoto,
+  postUploadLoadingPhoto,
+  postUploadStartPhoto,
+  postUploadUnloadPhoto,
+} from '@/api/distribution/VehicleArrivalManagement';
 import { useStore } from 'vuex';
 import { useRouter, useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
+import { getToken } from '@/utils/auth';
 
 const $route = useRoute();
 const $router = useRouter();
 const $store = useStore();
 
-type ImgArr =
-  | [
-      {
-        // 分类标题
-        title: string;
-        // 类型
-        type: string;
-        // 位置
-        position: string;
-        // 图片数组
-        imgArr:
-          | [
-              {
-                url: string;
-              }
-            ]
-          | [];
-      }
-    ]
-  | [];
+type ImgArr = {
+  // 分类标题
+  title: string;
+  // 类型
+  type: number;
+  // 位置
+  position: number;
+  // 图片数组
+  imgArr: {
+    id: string;
+    url: string;
+    imgUrl: string;
+  }[];
+}[];
+
+type LoadItme = {
+  nodeName?: string;
+  nodeId?: string;
+  /** 装车前图片 */
+  beforeLoadImgArr?: ImgArr;
+  /** 发车前图片 */
+  boforeStartImgArr?: ImgArr;
+  /** 卸车完成图片 */
+  beforeUnloadImgArr?: ImgArr;
+};
 
 const details = reactive({
   loadingObj: {
     pageLoading: false,
+    imgEdit: false,
   },
-  nodeImgArr: [],
-  /** 装车前图片 */
-  beforeLoadImgArr: [
-    {
-      title: '123',
-      type: '1',
-      position: '2',
-      imgArr: [
-        {
-          url: '',
-        },
-      ],
-    },
-  ] as ImgArr,
-  /** 发车前图片 */
-  boforeStartImgArr: [] as ImgArr,
-  /** 卸车完成图片 */
-  confirmUnloadImgArr: [] as ImgArr,
+  popUpShow: {
+    editImg: false,
+  },
+  /** 弹窗标题 */
+  title: '',
+  loadLineArr: [] as LoadItme[],
+  activeIndex: 0,
+  /** 提交类型 */
+  editType: 'beforeLoad' as 'beforeLoad' | 'boforeStart' | 'beforeUnload',
+  /** 回显数据 */
+  editFormList: [] as ImgArr,
+  /** 克隆数据 */
+  cloneImgList: [],
+  /** 类型字典 */
+  typeOption: {
+    '10': '车厢卫生',
+    '20': '盖雨棚前',
+    '21': '盖雨棚后',
+    '30': '卸车前车辆照片',
+    '31': '防护措施',
+  },
+  /** 位置字典 */
+  positionOption: {
+    '1': '前',
+    '2': '后',
+    '3': '左',
+    '4': '右',
+  },
+  /** 头部 */
+  headers: {
+    'Blade-Auth': 'bearer ' + getToken(),
+  },
+});
+
+// 装车前
+const beforeLoadImgArr = computed<ImgArr>((): ImgArr => {
+  const _arr = details.loadLineArr[details.activeIndex]?.beforeLoadImgArr;
+
+  return getObjType(_arr) === 'array' ? _arr : [];
 });
 
+// 发车前
+const boforeStartImgArr = computed<ImgArr>((): ImgArr => {
+  const _arr = details.loadLineArr[details.activeIndex]?.boforeStartImgArr;
+
+  return getObjType(_arr) === 'array' ? _arr : [];
+});
+
+// 卸车前
+const beforeUnloadImgArr = computed<ImgArr>((): ImgArr => {
+  const _arr = details.loadLineArr[details.activeIndex]?.beforeUnloadImgArr;
+
+  return getObjType(_arr) === 'array' ? _arr : [];
+});
+
+// 添加图片
+const handleAddImg = (arr, addArr, isHavePosition = true) => {
+  for (let i = 0; i < arr.length; i++) {
+    const val = arr[i];
+
+    let isContinue = false;
+
+    for (let j = 0; j < addArr.length; j++) {
+      const item = addArr[j];
+
+      console.log(
+        isHavePosition
+          ? item.type + '' === val.type + ''
+          : item.type + '' + item.position === val.type + '' + val.position
+      );
+
+      if (
+        isHavePosition
+          ? item.type + '' + item.position === val.type + '' + val.position
+          : item.type + '' === val.type + ''
+      ) {
+        item.imgArr.push({
+          url: val.url,
+          id: val.id,
+          imgUrl: val.url,
+        });
+        isContinue = true;
+
+        break;
+      }
+    }
+
+    if (isContinue) continue;
+
+    let title = isHavePosition
+      ? details.typeOption[val.type + ''] + ' - ' + details.positionOption[val.position]
+      : details.typeOption[val.type + ''];
+
+    const _obj = {
+      // 分类标题
+      title,
+      // 类型
+      type: val.type,
+      // 位置
+      position: val.position,
+      imgArr: [{ url: val.url, id: val.id, imgUrl: val.url }],
+    };
+
+    addArr.push(_obj);
+  }
+};
+
 /** 配载图片显示 */
 const initImgList = async () => {
   try {
@@ -147,23 +370,127 @@ const initImgList = async () => {
     const res = await postFindLinePhoto({ loadId: $route.query.loadId });
     const { code, data } = res.data;
     if (code !== 200 || getObjType(data) !== 'array') return;
-
+    details.loadLineArr = [];
     for (let i = 0; i < data.length; i++) {
       const value = data[i];
-      const { loadingObject, startObject, unloadObject } = value;
+      const { loadingObject, startObject, unloadObject, carsLoadLineEntity } = value;
+
+      const _obj: LoadItme = {
+        nodeId: '',
+        nodeName: '',
+        beforeLoadImgArr: [
+          {
+            title: '车厢卫生',
+            type: 10,
+            position: 1,
+            imgArr: [],
+          },
+        ],
+        boforeStartImgArr: [
+          {
+            title: '盖雨棚前 - 左',
+            type: 20,
+            position: 3,
+            imgArr: [],
+          },
+          {
+            title: '盖雨棚前 - 右',
+            type: 20,
+            position: 4,
+            imgArr: [],
+          },
+          {
+            title: '盖雨棚前 - 后',
+            type: 20,
+            position: 2,
+            imgArr: [],
+          },
+          {
+            title: '盖雨棚后 - 左',
+            type: 21,
+            position: 3,
+            imgArr: [],
+          },
+          {
+            title: '盖雨棚后 - 右',
+            type: 21,
+            position: 4,
+            imgArr: [],
+          },
+          {
+            title: '盖雨棚后 - 后',
+            type: 21,
+            position: 2,
+            imgArr: [],
+          },
+        ],
+        beforeUnloadImgArr: [
+          {
+            title: '卸车前车辆照片 - 左',
+            type: 20,
+            position: 3,
+            imgArr: [],
+          },
+          {
+            title: '卸车前车辆照片 - 右',
+            type: 20,
+            position: 4,
+            imgArr: [],
+          },
+          {
+            title: '卸车前车辆照片 - 后',
+            type: 20,
+            position: 2,
+            imgArr: [],
+          },
+          {
+            title: '防护措施 - 左',
+            type: 21,
+            position: 3,
+            imgArr: [],
+          },
+          {
+            title: '防护措施 - 右',
+            type: 21,
+            position: 4,
+            imgArr: [],
+          },
+          {
+            title: '防护措施 - 后',
+            type: 21,
+            position: 2,
+            imgArr: [],
+          },
+        ],
+      };
+
+      // 节点信息
+      if (getObjType(carsLoadLineEntity) === 'object') {
+        _obj.nodeName = carsLoadLineEntity.nodeName;
+        _obj.nodeId = carsLoadLineEntity.nodeId;
+      } else {
+        ElMessage.warning('存在异常节点信息');
+        return;
+      }
 
       // 装车前
-      if (getObjType(loadingObject) === 'object') {
-      } else details.beforeLoadImgArr = [];
+      if (getObjType(loadingObject) === 'array') {
+        handleAddImg(loadingObject, _obj.beforeLoadImgArr, false);
+      }
 
       // 发车前
-      if (getObjType(startObject) === 'object') {
-      } else details.beforeLoadImgArr = [];
+      if (getObjType(startObject) === 'array') {
+        handleAddImg(startObject, _obj.boforeStartImgArr);
+      }
+      // 卸车完成前
+      if (getObjType(unloadObject) === 'array') {
+        handleAddImg(unloadObject, _obj.beforeUnloadImgArr);
+      }
 
-      // 卸车前
-      if (getObjType(unloadObject) === 'object') {
-      } else details.beforeLoadImgArr = [];
+      details.loadLineArr.push(_obj);
     }
+
+    console.log(' details.loadLineArr :>> ', details.loadLineArr);
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
@@ -172,6 +499,150 @@ const initImgList = async () => {
 };
 
 initImgList();
+
+const handleCheckNode = (item, index) => {
+  details.activeIndex = index;
+};
+
+const handleEdit = (type, arr, title) => {
+  details.title = title;
+
+  console.log('arr :>> ', arr);
+  details.editType = type;
+  details.editFormList = deepClone([...arr]);
+
+  const _arr = [];
+  for (let i = 0; i < details.editFormList.length; i++) {
+    const value = details.editFormList[i];
+
+    for (let j = 0; j < value.imgArr.length; j++) {
+      const item = value.imgArr[j];
+      _arr.push({ ...value, ...item });
+    }
+  }
+  details.cloneImgList = _arr;
+
+  details.popUpShow.editImg = true;
+};
+
+/** 上传前 */
+const handleBeforeUpload = async (file, item) => {
+  try {
+    console.log('file :>> ', file);
+    console.log('item :>> ', item);
+    const isJPG = file.type === 'image/jpeg';
+    const isPNG = file.type === 'image/png';
+    const isLt2M = file.size / 1024 / 1024 < 2;
+
+    if (!isJPG && !isPNG) {
+      ElMessage.warning('上传图片只能是 JPG 或 PNG 格式!');
+      return false;
+    }
+    if (!isLt2M) {
+      ElMessage.warning('上传图片大小不能超过 2MB!');
+      return false;
+    }
+    item.loading = true;
+    const res = await compressImageBlob(file);
+    console.log('res :>> ', res);
+    return res;
+  } catch (error) {
+    console.log('error :>> ', error);
+  }
+};
+/** 上传成功 */
+const handleUpLoadSuccess = (file, item) => {
+  console.log('file :>> ', file);
+  console.log('item.imgArr :>> ', item.imgArr);
+
+  const { code, data } = file;
+
+  if (code !== 200) return;
+  for (let i = 0; i < item.imgArr.length; i++) {
+    const val = item.imgArr[i];
+
+    if (val.name !== data.originalName) continue;
+
+    val.imgUrl = data.link;
+  }
+};
+
+/** 编辑提交 */
+const handleEditSubmit = async () => {
+  try {
+    details.loadingObj.imgEdit = true;
+
+    const submitData = {
+      loadId: $route.query.loadId,
+      removeUrlList: [],
+      addUrlList: [],
+    };
+
+    const _cloneArr = deepClone(details.cloneImgList);
+
+    for (let i = 0; i < details.editFormList.length; i++) {
+      const value = details.editFormList[i];
+
+      for (let j = 0; j < value.imgArr.length; j++) {
+        const item = value.imgArr[j];
+
+        // 存在id, 则不提交
+        if (item.id) {
+          for (let index = 0; index < _cloneArr.length; index++) {
+            const val = _cloneArr[index];
+
+            if (item.id !== val.id) continue;
+            _cloneArr.splice(index, 1);
+            break;
+          }
+          continue;
+        }
+
+        if (!item.imgUrl) return ElMessage.warning('存在未上传完成的图片，请等待上传完成或移除');
+
+        submitData.addUrlList.push({
+          type: value.type,
+          position: value.position,
+          url: item.imgUrl,
+        });
+      }
+    }
+
+    submitData.removeUrlList = _cloneArr.map(val => val.id);
+
+    let res: any = { data: {} };
+
+    switch (details.editType) {
+      case 'beforeLoad':
+        res = await postUploadLoadingPhoto(submitData);
+        break;
+
+      case 'boforeStart':
+        res = await postUploadStartPhoto(submitData);
+        break;
+
+      case 'boforeStart':
+        res = await postUploadUnloadPhoto(submitData);
+        break;
+
+      default:
+        break;
+    }
+
+    const { code, msg } = res.data;
+    if (code !== 200) {
+      ElMessage.warning(msg);
+      return;
+    }
+    details.popUpShow.editImg = false;
+    ElMessage.success(msg);
+    initImgList();
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.imgEdit = false;
+  }
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,9 +655,11 @@ initImgList();
 
   &::before {
     content: '';
-    width: 3px;
-    height: 20px;
-    background-color: var(--el-color-primary);
+    width: 20px;
+    // height: 20px;
+    height: 1px;
+    // background-color: var(--el-color-primary);
+    background-color: #ccc;
     margin-right: 10px;
   }
 
@@ -194,7 +667,8 @@ initImgList();
     content: '';
     height: 1px;
     flex: 1;
-    background-color: var(--el-color-primary);
+    // background-color: var(--el-color-primary);
+    background-color: #ccc;
     margin-left: 10px;
   }
 }
@@ -292,8 +766,13 @@ initImgList();
   @extend .VehicleLineImgs_title;
   font-size: 16px;
 
-  &:first-child {
-    margin-top: 20px;
+  // &:first-child {
+  //   margin-top: 20px;
+  // }
+
+  &::before {
+    width: 2px;
+    height: 20px;
   }
 
   &::after {
@@ -303,7 +782,7 @@ initImgList();
 }
 
 .VehicleLineImgs_container_list {
-  padding: 20px;
+  padding: 0 20px;
 
   .title {
     @extend .VehicleLineImgs_container_title;
@@ -316,6 +795,38 @@ initImgList();
   .item {
     display: flex;
     flex-wrap: wrap;
+
+    .imgBox {
+      position: relative;
+      .remove {
+        $size: 30px;
+
+        width: $size;
+        height: $size;
+        border-radius: 50%;
+        background-color: #fff;
+        transition: all 0.5s;
+        opacity: 0;
+        position: absolute;
+        top: 10px;
+        right: 10px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+        z-index: 2001;
+      }
+
+      &:hover {
+        .remove {
+          opacity: 1;
+        }
+      }
+    }
+
+    .add {
+      margin: 5px;
+    }
   }
 }
 </style>
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index d50fb84d..e72b972a 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -1617,6 +1617,16 @@ const searchOrder = async () => {
     details.loadingObj.searchOrder = false;
   }
 };
+
+const handleShowVehicleImgs = ({ row }) => {
+  $router.push({
+    path: '/distribution/artery/VehicleNodeImgs',
+    query: {
+      name: `${row.carsNo} - 节点图片`,
+      loadId: row.id,
+    },
+  });
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/distribution/artery/addTripartiteTransfer.vue b/src/views/distribution/artery/addTripartiteTransfer.vue
index f400992b..730349ed 100644
--- a/src/views/distribution/artery/addTripartiteTransfer.vue
+++ b/src/views/distribution/artery/addTripartiteTransfer.vue
@@ -496,6 +496,8 @@ import {
   debounce,
   deepClone,
   getObjType,
+  handleTranslationDataSeclect,
+  handleSelectQuery,
 } from '@/utils/util';
 import { columnList, newColumnList } from '@/option/distribution/addVehicleStowage';
 import {
@@ -883,6 +885,7 @@ const initOriginWarehouseOrder = debounce(async function (params = {}) {
     const { code, data } = res.data;
     if (code !== 200) return;
     details.oldData = data.records;
+    handleTranslationDataSeclect(details.oldData, details.columnList);
     details.oldPage.total = data.total;
   } catch (error) {
     console.log('error :>> ', error);
@@ -1016,12 +1019,7 @@ const timesc = (index, row) => {
 
 /** 表格表头下拉框选择 */
 const selectsc = (index, row) => {
-  details.query[row.prop] = index;
-  if (!index && index !== 0) delete details.query[row.prop];
-  if (row.prop === 'certificateTypeName') {
-    details.query['certificateType'] = index;
-    if (!index) delete details.query['certificateType'];
-  }
+  handleSelectQuery(index, row, details.query);
   initOriginWarehouseOrder();
 };
 
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index 4bfa5943..02fc61d0 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -584,7 +584,13 @@ import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import dayjs from 'dayjs';
 import { getDeliveryListExport } from '@/api/distribution/distributionDeliveryList';
-import { downloadXls, handleClearTableQuery, setNodeHeight } from '@/utils/util';
+import {
+  downloadXls,
+  handleClearTableQuery,
+  handleSelectQuery,
+  handleTranslationDataSeclect,
+  setNodeHeight,
+} from '@/utils/util';
 import { getToken } from '@/utils/auth';
 import { ElMessage, ElMessageBox } from 'element-plus';
 export default {
@@ -1005,6 +1011,25 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'isTimeOutName',
+          label: '是否超时',
+          type: 3,
+          values: '',
+          width: '100',
+          checkarr: [
+            {
+              value: '0',
+              label: '否',
+            },
+            {
+              value: '1',
+              label: '是',
+            },
+          ],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: '',
           label: '操作',
@@ -2346,14 +2371,7 @@ export default {
       console.log(index, row);
     },
     selectsc(index, row) {
-      this.query[row.prop] = index;
-      if (!index) {
-        delete this.query[row.prop];
-      }
-      if (row.prop === 'deliveryTypeName') {
-        this.query.deliveryType = index;
-        if (!index) delete this.query.deliveryType;
-      }
+      handleSelectQuery(index, row, this.query);
       this.onLoad(this.page);
     },
     timesc(index, row) {
@@ -2538,21 +2556,12 @@ export default {
         const data = res.data.data;
         // eslint-disable-next-line no-empty
         for (let i = 0; i < data.records.length; i++) {
-          // eslint-disable-next-line no-empty
-          // for (let j = 0; j < this.deliveryTypeData.length; j++) {
-          //   // eslint-disable-next-line no-empty
-          //   if (data.records[i].deliveryType == this.deliveryTypeData[j].dictKey) {
-          //     data.records[i].deliveryType = this.deliveryTypeData[j].dictValue;
-          //   }
-          // }
           for (let j = 0; j < this.orderSourceData.length; j++) {
-            // eslint-disable-next-line no-empty
             if (data.records[i].orderSource == this.orderSourceData[j].dictKey) {
               data.records[i].orderSource = this.orderSourceData[j].dictValue;
             }
           }
           for (let j = 0; j < this.signingStatusData.length; j++) {
-            // eslint-disable-next-line no-empty
             if (data.records[i].driverSigning == this.signingStatusData[j].dictKey) {
               data.records[i].driverSigning = this.signingStatusData[j].dictValue;
             }
@@ -2560,6 +2569,7 @@ export default {
         }
         this.page.total = data.total;
         this.data = data.records;
+        handleTranslationDataSeclect(this.data, this.columnList);
         this.loading = false;
         // this.selectionClear();
       });
diff --git a/src/views/reportforms/ConsigneeReport.vue b/src/views/reportforms/ConsigneeReport.vue
index f78127d1..14745f50 100644
--- a/src/views/reportforms/ConsigneeReport.vue
+++ b/src/views/reportforms/ConsigneeReport.vue
@@ -55,7 +55,7 @@
             />
           </el-form-item>
 
-          <el-form-item label="时间周期">
+          <el-form-item label="制单时间">
             <el-date-picker
               v-model="query.timeArr"
               type="daterange"
diff --git a/src/views/reportforms/SalesDepartmentIncomeReport.vue b/src/views/reportforms/SalesDepartmentIncomeReport.vue
index 0fce5108..d4409464 100644
--- a/src/views/reportforms/SalesDepartmentIncomeReport.vue
+++ b/src/views/reportforms/SalesDepartmentIncomeReport.vue
@@ -55,7 +55,7 @@
             />
           </el-form-item>
 
-          <el-form-item label="时间周期">
+          <el-form-item label="制单时间">
             <el-date-picker
               v-model="query.timeArr"
               type="daterange"