From 28e2b41d0a886174fa15a31ee6de4577ae108436 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Wed, 23 Oct 2024 10:30:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.prod | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.env.prod b/.env.prod
index 0b6ddda..4b5b164 100644
--- a/.env.prod
+++ b/.env.prod
@@ -2,15 +2,15 @@
NODE_ENV = 'production'
# 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = "车联通"后台管理系统
# 芋道管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'https://www.nuoyunr.com'
# 根据服务器或域名修改
-PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+PUBLIC_PATH = 'http://159.75.168.143:82'
# 附件请求地址前缀
-VUE_APP_FILE_API = 'http://122.51.230.86:9000/'
+VUE_APP_FILE_API = 'https://www.nuoyunr.com/minio/'
# 二级部署路径
VUE_APP_APP_NAME ='yudao-admin'
From deff2195f38bb77433ace9896d8704ba21833fa1 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Wed, 23 Oct 2024 11:20:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95?=
=?UTF-8?q?=E5=8F=8A=E9=A1=B9=E7=9B=AE=E7=94=9F=E5=91=BD=E5=91=A8=E6=9C=9F?=
=?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tickets/Components/TicketManagerItem.vue | 29 ++++++++++++++-----
.../repair/tickets/form/UpdateRecord.vue | 10 +++----
2 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/views/repair/tickets/Components/TicketManagerItem.vue b/src/views/repair/tickets/Components/TicketManagerItem.vue
index 237abf5..ac2c3c7 100644
--- a/src/views/repair/tickets/Components/TicketManagerItem.vue
+++ b/src/views/repair/tickets/Components/TicketManagerItem.vue
@@ -44,24 +44,32 @@
查看
-
+
接单
通知施工
-
+
开始施工
-
+
过程记录
-
+
施工完成
-
- 终检
-
+
+
+
重新指派
@@ -142,6 +150,7 @@ import {createUniqueCodeByHead} from "@/utils/createUniqueCode";
import {updateTicketWares} from "@/api/repair/tickets/TicketWares";
import {getIfLeader} from "@/api/repair/repairworker";
import UpdateRecord from "@/views/repair/tickets/form/UpdateRecord.vue";
+import {getUserProfile} from "@/api/system/user";
export default {
name: "TicketManagerItem",
@@ -180,13 +189,19 @@ export default {
formData: {},
remark: null,
leader: false,
+ nowUser: null
}
},
mounted() {
this.listTickets()
this.isLeader()
+ this.getNowUser()
},
methods: {
+ async getNowUser(){
+ const res = await getUserProfile()
+ this.nowUser = res.data
+ },
async isLeader(){
const res = await getIfLeader()
this.leader = res.data
diff --git a/src/views/repair/tickets/form/UpdateRecord.vue b/src/views/repair/tickets/form/UpdateRecord.vue
index 4b1d114..8221ced 100644
--- a/src/views/repair/tickets/form/UpdateRecord.vue
+++ b/src/views/repair/tickets/form/UpdateRecord.vue
@@ -53,11 +53,11 @@
部分完成
-
+
完成并移交下一班组
+ @click="doFinish(false)">
{{ isEndCheck ? "完成并移交总检" : "完成工单" }}
@@ -190,20 +190,20 @@ export default {
} catch {
}
},
- async doFinish() {
+ async doFinish(flag) {
try {
await this.$refs.formRef.validate()
this.formLoading = true
// 不论是什么按钮，这个工单子项是完了的
this.formData.item.itemStatus = "03"
// 整体完成并指派下一个人
- if (this.isNext) {
+ if (this.isNext || flag) {
this.formData['finishType'] = "01"
await this.$refs.updateRepair.open(this.clickRow)
return
}
// 整体完成并移交总检
- if (this.isEndCheck) {
+ if (this.isEndCheck || !flag) {
this.formData['finishType'] = "02"
this.formData.ticketsWorkStatus = "05"
await this.doUpdate();