历史调令去掉操作、导出的列和左下角设置的内容一致。水泵和闸门的数量可以正确选择，同时水泵增加全关、减少、增加选项，调令开启前可以取消

src/views/order/component/adjust.vue

@@ -46,7 +46,7 @@
           <div class="xy-table-item-label">调整类型 ：</div>
           <div class="xy-table-item-content">
             <div style="width: 300px">
-              <el-radio-group v-model="adjustEquipmentType">
+              <el-radio-group v-model="adjustEquipmentType" @change="temp++">
                 <el-radio :label="1">水泵</el-radio>
                 <el-radio :label="2">闸门</el-radio>
               </el-radio-group>
@@ -55,6 +55,7 @@
                 v-model="form.tiaozhengleixing"
                 clearable
                 placeholder="请选择调整类型"
+                @change="temp++"
               >
                 <el-option
                   v-for="item in types"
@@ -67,11 +68,11 @@
           </div>
         </div>
       </template>
-      <template #kaiqishuliang v-if="equipmentType === 1">
+      <template #kaiqishuliang>
         <div class="xy-table-item">
           <div class="xy-table-item-label">调整数量 ：</div>
           <div class="xy-table-item-content">
-            <el-input-number :min="0" :max="openNumberMax" controls-position="right" style="width: 300px" v-model="form.kaiqishuliang"></el-input-number>
+            <el-input-number :disabled="form.tiaozhengleixing === 2" :min="0" :max="openNumberMax" controls-position="right" style="width: 300px" v-model="kaiqishuliang"></el-input-number>
           </div>
         </div>
       </template>
@@ -117,16 +118,19 @@ export default {
   },
   data() {
     return {
+      temp: 0,//更新调整数量
       adjustEquipmentType: 1,
       isShow: false,
       id: "",
       type: "",
       detail: {},
 
+      kaiqishuliang: 0,
       form: {
         content: "",
         tiaozhengleixing: "",
         kaiqishuliang: 0,
+        kaiqishuliang1: 0,
         start_time: "",
         end_time: ""
       },
@@ -200,23 +204,27 @@ export default {
       }
       const leixingLabel = this.types.find(i => i.id === this.form.tiaozhengleixing)?.id
       if (leixingLabel === 0) {
-        this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) - Number(this.form.kaiqishuliang)
+        this.equipmentType === 1 ? (this.form.kaiqishuliang1 = Number(this.detail?.kaiqishuliang1) - Number(this.kaiqishuliang)) : (this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) - Number(this.kaiqishuliang))
       } else if (leixingLabel === 1) {
-        this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) + Number(this.form.kaiqishuliang)
+        this.equipmentType === 1 ? (this.form.kaiqishuliang1 = Number(this.detail?.kaiqishuliang1) + Number(this.kaiqishuliang)) : (this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) + Number(this.kaiqishuliang))
       } else {
+        this.equipmentType === 1 ? this.form.kaiqishuliang1 = 0 : this.form.kaiqishuliang = 0;
       }
       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)
         let kv = new Map([
           ['content','调令内容'],
           ['tiaozhengleixing','调整状态'],
-          ['kaiqishuliang','调整数量'],
+          ['kaiqishuliang1','水泵调整数量'],
+          ['kaiqishuliang','闸门调整数量'],
         ])
         for (let key of kv.keys()) {
-          if (key === 'kaiqishuliang') {
+          if (key === 'kaiqishuliang' || key === 'kaiqishuliang1') {
             if (this.detail.equipment_id_equipments_id_relation?.type === 1) {
               text += nowData[key] === originalData[key] ? "" : (`【${kv.get(key)}】从"${originalData[key] || "0"}"更改为"${nowData[key]}"` || " ")
             }
@@ -274,11 +282,14 @@ export default {
     },
 
     openNumberMax () {
+      let a = this.temp;
       const leixingLabel = this.types.find(i => i.id === this.form.tiaozhengleixing)?.value
       if (leixingLabel === '关闭') {
-        return Number(this.detail?.kaiqishuliang) || 0
-      }  else {
-        return (Number(this.detail?.equipment_id_equipments_id_relation?.bengzhashuliang) - Number(this.detail?.kaiqishuliang)) || 0
+        return this.equipmentType === 1 ? (Number(this.detail?.kaiqishuliang1 || 0)) : (Number(this.detail?.kaiqishuliang || 0))
+      } else if (leixingLabel === '全关') {
+        return this.equipmentType === 1 ? (Number(this.detail?.kaiqishuliang1 || 0)) : (Number(this.detail?.kaiqishuliang || 0));
+      } else {
+        return this.equipmentType === 1 ? ((Number(this.detail?.equipment_id_equipments_id_relation?.shuibengtaishu) - Number(this.detail?.kaiqishuliang1) || 0)) : ((Number(this.detail?.equipment_id_equipments_id_relation?.bengzhashuliang) - Number(this.detail?.kaiqishuliang) || 0))
       }
     },
 
@@ -298,6 +309,10 @@ export default {
           {
             id: 1,
             value: "增开"
+          },
+          {
+            id: 2,
+            value: "全关"
           }
         ]
       } else {
@@ -309,6 +324,10 @@ export default {
           {
             id: 1,
             value: "调整开度"
+          },
+          {
+            id: 2,
+            value: "全关"
           }
         ]
       }
@@ -329,6 +348,9 @@ export default {
         delete this.form.id;
       }
     },
+    temp(val) {
+      this.kaiqishuliang = 0;
+    }
   },
 };
 </script>

src/views/order/handle.vue

@@ -82,6 +82,7 @@
           :destroy-action="destroy"
           ref="xyTable"
           :border="true"
+          :row-key="row => row.id"
           :action="index"
           :req-opt="tableSelect"
           :destroy-req-opt="select"

src/views/order/history.vue

@@ -635,18 +635,28 @@ export default {
     },
 
     async exportExcel(sheetName) {
+      let filterTableColumns = this.$refs['xyTable']?.tableFormat || []
       const res = await index(
         Object.assign(this.select, { page: 1, page_size: 9999 })
       );
       if (res.data) {
-        let headers = this.form.filter(i => i.list_show).map((i) => {
+        let headers = this.form.filter(i => filterTableColumns.find(j => j.prop === i.field)).map((i) => {
           return {
             key: i.field,
             title: i.name,
           };
         });
+        if (filterTableColumns.find(i => i.label === '范围')) {
+          headers.splice(1,0,{
+            key: "",
+            title: '范围',
+          })
+        }
         const data = res.data.map((row) =>
           headers.map((header) => {
+            if (header.title === '范围') {
+              return this.areas.find(i => i.value === row?.equipment_id_equipments_id_relation?.area)?.key
+            }
             const i = this.form.find(i => i.field === header.key)
             //if (i.edit_input === 'file' || i.edit_input === 'files') return ''
             if (
@@ -908,7 +918,7 @@ export default {
             )
           );
         });
-      this.table.unshift({
+      this.table.splice(1,0,{
         width: 100,
         label: "范围",
         prop: "equipment_id_equipments_id_relation.area",
@@ -916,12 +926,6 @@ export default {
           return this.areas.find(i => i.value === val)?.key
         }
       });
-      this.table.unshift({
-        type: "index",
-        width: 60,
-        label: "序号",
-        prop: "index"
-      });
     },
   },