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 ( -
+
{ (row.id_transfers_to_transfer_id_relation || []).map((i,index) => (
@@ -747,6 +747,14 @@ export default { 调整时间: { this.$moment(i.created_at).format('YYYY-MM-DD HH:mm') }
+
+ 当前闸门数量: + { i.kaiqishuliang } +
+
+ 当前水泵数量: + { i.kaiqishuliang1 } +
调整类型: { this.form.find(i => i.field === "tiaozhengleixing")?._params?.find(j => j.value == i.tiaozhengleixing)?.key } 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 {
) }, - { - "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": "调整类型",