From 5abc0bd280c1359e547119475b54e5f09b2477f8 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Fri, 2 Aug 2024 09:27:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8A=E6=97=A5=E8=B0=83=E4=BB=A4=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/component/adjust.vue |  2 --
 src/views/order/handle.vue           | 10 +++++-
 src/views/order/today.vue            | 50 ++++++++--------------------
 3 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/src/views/order/component/adjust.vue b/src/views/order/component/adjust.vue
index b4a8443..377bab1 100644
--- a/src/views/order/component/adjust.vue
+++ b/src/views/order/component/adjust.vue
@@ -212,8 +212,6 @@ export default {
       }
       let updateData = JSON.stringify(this.form);
       let text = ""
-      console.log(this.form)
-      return
       if (updateData !== this.originalData) {
         let originalData = JSON.parse(this.originalData)
         let nowData = JSON.parse(updateData)
diff --git a/src/views/order/handle.vue b/src/views/order/handle.vue
index 9e595ba..61b6b74 100644
--- a/src/views/order/handle.vue
+++ b/src/views/order/handle.vue
@@ -738,7 +738,7 @@ export default {
         width: 46,
         expandFn:({ row }) => {
           return (
-            <div style="max-width: 600px;padding: 10px;">
+            <div style="max-width: 800px;padding: 10px;">
               {
                 (row.id_transfers_to_transfer_id_relation || []).map((i,index) => (
                   <div style="display: flex;">
@@ -747,6 +747,14 @@ export default {
                       <span style="font-weight: 600;padding: 0 6px;">调整时间：</span>
                       <span>{ this.$moment(i.created_at).format('YYYY-MM-DD HH:mm') }</span>
                     </div>
+                    <div>
+                      <span style="font-weight: 600;padding: 0 6px;">当前闸门数量：</span>
+                      <span>{ i.kaiqishuliang }</span>
+                    </div>
+                    <div>
+                      <span style="font-weight: 600;padding: 0 6px;">当前水泵数量：</span>
+                      <span>{ i.kaiqishuliang1 }</span>
+                    </div>
                     <div>
                       <span style="font-weight: 600;padding: 0 6px;">调整类型：</span>
                       <span>{ this.form.find(i => i.field === "tiaozhengleixing")?._params?.find(j => j.value == i.tiaozhengleixing)?.key }</span>
diff --git a/src/views/order/today.vue b/src/views/order/today.vue
index cc8022b..2eca0f2 100644
--- a/src/views/order/today.vue
+++ b/src/views/order/today.vue
@@ -148,15 +148,10 @@ export default {
       diaolingleixing: [],
       table: [
         {
-          "type": "index",
-          "width": 60,
-          "label": "序号"
-        },
-        {
-          "prop": "xuhao",
-          "label": "序号",
-          "width": 0,
-          "align": "center"
+          prop: "id",
+          width: 60,
+          label: "序号",
+          formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
         },
         {
           "prop": "equipment_id_equipments_id_relation.name",
@@ -165,11 +160,16 @@ export default {
           "align": "center"
         },
         {
-          "prop": "diaolingleixing",
-          "label": "调令类型",
+          "prop": "start_time",
+          "label": "开始时间",
           "width": 0,
-          "align": "center",
-          formatter: (data,row,val) => this.diaolingleixing.find(i => i.value === val)?.key
+          "align": "center"
+        },
+        {
+          "prop": "end_time",
+          "label": "结束时间",
+          "width": 0,
+          "align": "center"
         },
         {
           "prop": "kaiqishuliang",
@@ -216,18 +216,6 @@ export default {
             </div>
           )
         },
-        {
-          "prop": "start_time",
-          "label": "开始时间",
-          "width": 0,
-          "align": "center"
-        },
-        {
-          "prop": "end_time",
-          "label": "结束时间",
-          "width": 0,
-          "align": "center"
-        },
         {
           "prop": "act_start_time",
           "label": "实际开始时间",
@@ -246,18 +234,6 @@ export default {
           "width": 0,
           "align": "center"
         },
-        {
-          "prop": "level",
-          "label": "调令等级",
-          "width": 0,
-          "align": "center"
-        },
-        {
-          "prop": "jieshouren",
-          "label": "接收人",
-          "width": 0,
-          "align": "center"
-        },
         {
           "prop": "tiaozhengleixing",
           "label": "调整类型",