今日调令列表字段调整

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)

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>

src/views/order/today.vue

@@ -148,15 +148,10 @@ export default {
       diaolingleixing: [],
       table: [
         {
-          "type": "index",
+          prop: "id",
-          "width": 60,
+          width: 60,
-          "label": "序号"
+          label: "序号",
-        },
+          formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
-        {
-          "prop": "xuhao",
-          "label": "序号",
-          "width": 0,
-          "align": "center"
         },
         {
           "prop": "equipment_id_equipments_id_relation.name",
@@ -165,11 +160,16 @@ export default {
           "align": "center"
         },
         {
-          "prop": "diaolingleixing",
+          "prop": "start_time",
-          "label": "调令类型",
+          "label": "开始时间",
           "width": 0,
-          "align": "center",
+          "align": "center"
-          formatter: (data,row,val) => this.diaolingleixing.find(i => i.value === val)?.key
+        },
+        {
+          "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": "调整类型",