From e445057b4df5be4a8e64a5f5377efeec154960e4 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 14 Oct 2022 10:01:29 +0800
Subject: [PATCH] 事件详情事件轨迹维修轨迹添加处理时间；维修派单没有添加备注默认备注为已派单
---
src/views/eventgm/eventgmDetail.vue | 2 ++
src/views/repairsorder/sendorder.vue | 3 +++
src/util/determiningFileFormat.js | 5 +++++
3 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/util/determiningFileFormat.js b/src/util/determiningFileFormat.js
index be72c3c..87542b5 100644
--- a/src/util/determiningFileFormat.js
+++ b/src/util/determiningFileFormat.js
@@ -1,3 +1,8 @@
+/**
+ * 根据字符串后缀判断是否是图片（仅判断png、jpg、jpeg、webp格式）
+ * @param str
+ * @returns {boolean}
+ */
export const isImage = (str) =>{
var reg = /.(png|jpg|gif|jpeg|webp)$/;
return reg.test(str);
diff --git a/src/views/eventgm/eventgmDetail.vue b/src/views/eventgm/eventgmDetail.vue
index 70b2e4c..24c2a49 100644
--- a/src/views/eventgm/eventgmDetail.vue
+++ b/src/views/eventgm/eventgmDetail.vue
@@ -164,6 +164,7 @@
>
<el-table-column prop="person" label="处理人员" align="center"></el-table-column>
<el-table-column prop="remark" label="说明" align="center"></el-table-column>
+ <el-table-column prop="createTime" label="处理时间" align="center"></el-table-column>
</el-table>
</el-card>
<!--事件轨迹结束-->
@@ -227,6 +228,7 @@
>
<el-table-column prop="repairPerson" label="处理人员" align="center"></el-table-column>
<el-table-column prop="remark" label="说明" align="center"></el-table-column>
+ <el-table-column prop="createTime" label="处理时间" align="center"></el-table-column>
</el-table>
</el-card>
<!--维修轨迹结束-->
diff --git a/src/views/repairsorder/sendorder.vue b/src/views/repairsorder/sendorder.vue
index e5a58e5..e63f3ac 100644
--- a/src/views/repairsorder/sendorder.vue
+++ b/src/views/repairsorder/sendorder.vue
@@ -69,6 +69,9 @@
submit(row,done) {
this.repairsorder.toUserId = row.toUserId
// row.repairPerson = this.form.$repairPerson
+ if (!row.remark){
+ row.remark = "已派单"
+ }
update(this.repairsorder).then(() => {
add(row).then(() => {
this.$refs.form.resetFields()
--
Gitblit v1.9.3