diff --git a/src/views/bigScreen1/component/detailTransfer.vue b/src/views/bigScreen1/component/detailTransfer.vue index 5350d85..9e8d2a1 100644 --- a/src/views/bigScreen1/component/detailTransfer.vue +++ b/src/views/bigScreen1/component/detailTransfer.vue @@ -50,7 +50,7 @@ -
+
接收时间:{{ $moment(data.receive_time).format("YYYY-MM-DD HH:mm") }}
通知开启:{{ $moment(data.notice_open_time).format("YYYY-MM-DD HH:mm") }}
开启时间:{{ $moment(data.open_time).format("YYYY-MM-DD HH:mm") }}
@@ -59,15 +59,6 @@

{{ $moment(item.created_at).format("YYYY-MM-DD HH:mm") }}{{ item.content }}

- - - - - - - - -
@@ -103,7 +94,7 @@

执行状态:{{ typeMap.get(data.status) }}

-

+

开启数量:{{ data.kaiqishuliang }} / {{ data.equipment_id_equipments_id_relation ? data.equipment_id_equipments_id_relation.bengzhashuliang : 0 }}

diff --git a/src/views/bigScreen1/component/toDo.vue b/src/views/bigScreen1/component/toDo.vue index 936d57c..57a46d8 100644 --- a/src/views/bigScreen1/component/toDo.vue +++ b/src/views/bigScreen1/component/toDo.vue @@ -71,7 +71,7 @@
-
+
{{ s.label }}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 9b216ae..abb5459 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,6 +2,7 @@
+
动态
@@ -12,7 +13,7 @@ diff --git a/src/views/order/component/adjust.vue b/src/views/order/component/adjust.vue index 026a3ff..36805ee 100644 --- a/src/views/order/component/adjust.vue +++ b/src/views/order/component/adjust.vue @@ -151,6 +151,13 @@ export default { }, submit() { + if (this.form.tiaozhengleixing === "" || this.form.tiaozhengleixing === undefined) { + this.$message({ + message: "请选择类型", + type: "warning" + }) + return + } 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) @@ -170,7 +177,9 @@ export default { ]) for (let key of kv.keys()) { if (key === 'kaiqishuliang') { - text += nowData[key] === originalData[key] ? "" : (`【${kv.get(key)}】从"${originalData[key] || "0"}"更改为"${nowData[key]}"` || " ") + if (this.detail.equipment_id_equipments_id_relation?.type === 1) { + text += nowData[key] === originalData[key] ? "" : (`【${kv.get(key)}】从"${originalData[key] || "0"}"更改为"${nowData[key]}"` || " ") + } } else { text += nowData[key] === originalData[key] ? "" : (`【${kv.get(key)}】从"${this.types.find(i => i.id === originalData[key])?.value || originalData[key] || " "}"更改为"${this.types.find(i => i.id === nowData[key])?.value || nowData[key]}"` || " ") } @@ -180,7 +189,8 @@ export default { this.form.is_adjust = 1; this.form.id_logs_transfer_id_relation = this.detail.id_logs_transfer_id_relation.map(i => ({ transfer_id: i.transfer_id, - content: i.content + content: i.content, + created_at: this.$moment().format("YYYY-MM-DD HH:mm:ss") })) this.form.id_logs_transfer_id_relation.push({ transfer_id: this.detail.id, @@ -202,7 +212,8 @@ export default { save({ table_name: "logs", transfer_id: this.getId(), - content: text + content: text, + created_at: this.$moment().format("YYYY-MM-DD HH:mm:ss") },false) } this.$message({ diff --git a/src/views/order/handle.vue b/src/views/order/handle.vue index 8cf00a5..b147bf0 100644 --- a/src/views/order/handle.vue +++ b/src/views/order/handle.vue @@ -754,7 +754,7 @@ export default {
调整类型: - { i.tiaozhengleixing } + { this.form.find(i => i.field === "tiaozhengleixing")?._params?.find(j => j.value == i.tiaozhengleixing)?.key }
调整内容: