From 44b475116bdf4bfe02f6cca5e7a3297fa4330094 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Fri, 23 Aug 2024 09:57:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8E=89=E4=BA=86=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/mergeTableRow.js                   |  7 ++-
 src/views/dashboard/index.vue                | 45 ++++++++++++++++++++
 src/views/order/component/createDispatch.vue |  5 ++-
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/utils/mergeTableRow.js b/src/utils/mergeTableRow.js
index 05f7ebd..c6e2119 100644
--- a/src/utils/mergeTableRow.js
+++ b/src/utils/mergeTableRow.js
@@ -14,7 +14,12 @@ export function mergeTableRow (config) {
   mergeColNames.forEach((m) => {
     const mList = {}
     data = data.map((v, index) => {
-      // 区分需要合并行的key值
+      // 区分需要合并行的kemergeTableRow({
+      //         data: this.selectArea ? list.filter(i => (i.equipment_id_equipments_id_relation?.area === this.selectArea)) : list,
+      //         mergeColNames: ["equipment_id_equipments_id_relation.area","equipment_id_equipments_id_relation.name"], // 需要合并的列，默认合并列相同的数据
+      //         firstMergeColNames: ["equipment_id_equipments_id_relation.area","equipment_id_equipments_id_relation.name"], // 受影响的列，只合并以firstMerge为首的同类型数据
+      //         firstMerge: "equipment_id", // 以哪列为基础进行合并，一般为第一列
+      //       });y值
       const rowVal = v[firstMerge] + '-' + v[m]
       // 需要合并行的第二行以及之后行会走if
       // m === firstMerge 判断需要合并的列是否是基准列，如果是则只满足前面的条件，如果不是则需满足前面+后面的条件
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index abb5459..afe0fed 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,5 +1,9 @@
 <template>
   <div>
+    <div class="mobile-links">
+      <button @click="$router.push('/mobile/create')">创建调令</button>
+      <button @click="$router.push('/mobile/list')">调令列表</button>
+    </div>
 
     <div class="statistics">
       <div class="title">动态</div>
@@ -66,4 +70,45 @@ export default {
     top: 50%;
   }
 }
+.mobile-links {
+  display: none;
+}
+@media (max-width: 768px) {
+  .mobile-links {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 20px;
+
+    & > button {
+      cursor: pointer;
+      width: 44%;
+      color: #fff;
+      padding: 8px 12px;
+      border: none;
+      border-radius: 6px;
+      transition: all .2s;
+      &:active {
+        outline: 0;
+      }
+      &:focus {
+        box-shadow: 0 0 0 2px rgba(45,140,240,.2);
+      }
+    }
+    button:nth-child(1) {
+      background: $primaryColor;
+      margin-right: 6px;
+      &:active {
+        background-color: #2b85e4;
+        border-color: #2b85e4;
+      }
+    }
+    button:nth-child(2) {
+      background: rgb(89, 187, 115);
+      &:active {
+        background-color: #18b566;
+        border-color: #18b566;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/order/component/createDispatch.vue b/src/views/order/component/createDispatch.vue
index 9cc8336..b2d1bf8 100644
--- a/src/views/order/component/createDispatch.vue
+++ b/src/views/order/component/createDispatch.vue
@@ -1020,6 +1020,9 @@ export default {
         if (!item.start_time || !item.end_time || !item.level) {
           verify = false;
         }
+        if (this.$moment(`${this.date} ${item.end_time}`).isSameOrBefore(this.$moment(`${this.date} ${item.start_time}`))) {
+          verify = false;
+        }
         if (this.diaolingleixing.find(i => i.value === item.diaolingleixing)?.key === "船只过闸调令") {
           if (item.start_time) {
             verify = true
@@ -1029,7 +1032,7 @@ export default {
       if (!verify) {
         this.$message({
           type: "warning",
-          message: "请填写完整信息",
+          message: "请填写完整信息或结束时间有误",
         });
         return;
       }