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] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=A2=9E=E5=8A=A0=E5=B9=B2?=
 =?UTF-8?q?=E7=BA=BF=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=A6=96=E9=A1=B5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=AC=E5=91=8A=EF=BC=8C=E7=BB=93=E7=AE=97=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=89=B9=E9=87=8F=E7=BB=93=E7=AE=97=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=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>