From 1b98d158572c0e77e74573a8f957de00fce84d0f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 28 Feb 2024 16:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E4=BF=AE=E5=92=8C?=
=?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/deviceReport/addForm.vue | 8 +-
src/pages/deviceReport/index.vue | 2 +-
src/pages/repairOrder/addForm.vue | 15 +-
src/pages/repairOrder/addServiceRecord.vue | 8 +-
src/pages/repairOrder/detail.vue | 241 ++++++++++++---------
src/pages/repairOrder/index.vue | 5 +-
src/store/modules/user.js | 18 +-
src/utils/constant.js | 3 +-
src/utils/storage.js | 2 +-
9 files changed, 166 insertions(+), 136 deletions(-)
diff --git a/src/pages/deviceReport/addForm.vue b/src/pages/deviceReport/addForm.vue
index 4d3010b..435f402 100644
--- a/src/pages/deviceReport/addForm.vue
+++ b/src/pages/deviceReport/addForm.vue
@@ -28,13 +28,13 @@
-
+
{{selectFormat(form.deviceNumber,deviceList)}}
- {{`请选择${type=='DEVICE'||type == 'THEN'?'设备' : '模具'}`}}
+ {{`请选择${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}`}}
@@ -124,7 +124,7 @@
},
// 根据设备/模具号查询信息
getDetailsByNumber() {
- if (this.type == 'DEVICE'||this.type == 'THEN') {
+ if (this.type == 'DEVICE'||this.type == 'TECH') {
deviceApi.getDeviceByFactoryAreaNumber(this.form.factoryAreaNumber).then((res) => {
if (res.data && res.data.length > 0) {
res.data.map(item => {
@@ -162,7 +162,7 @@
return;
}
if (!this.form.deviceNumber) {
- this.$modal.showToast(`请选择${this.type=='DEVICE'||this.type=='THEN'?'设备' : '模具'}`)
+ this.$modal.showToast(`请选择${this.type=='DEVICE'||this.type=='TECH'?'设备' : '模具'}`)
return;
}
if (!this.form.receiverType) {
diff --git a/src/pages/deviceReport/index.vue b/src/pages/deviceReport/index.vue
index a3965b6..f920cc1 100644
--- a/src/pages/deviceReport/index.vue
+++ b/src/pages/deviceReport/index.vue
@@ -22,7 +22,7 @@
报修单号:{{item.number}}
- 类型:{{item.type=='DEVICE'?'设备':item.type=='THEN'?'工艺':'模具'}}
+ 类型:{{item.type=='DEVICE'?'设备':item.type=='TECH'?'工艺':'模具'}}
{{`${params.type=='DEVICE'?'设备' : '模具'}`}}编号:{{item.deviceNumber}}
diff --git a/src/pages/repairOrder/addForm.vue b/src/pages/repairOrder/addForm.vue
index dcf85f4..c5c82c1 100644
--- a/src/pages/repairOrder/addForm.vue
+++ b/src/pages/repairOrder/addForm.vue
@@ -16,13 +16,13 @@
-
+
{{form.deviceName}}
- {{`请输入${type=='DEVICE'?'设备' : '模具'}名称`}}
+ {{`请输入${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}名称`}}
@@ -107,7 +107,7 @@
return;
}
if (!this.form.deviceNumber) {
- this.$modal.showToast(`请选择${this.type=='DEVICE'?'设备' : '模具'}名称`)
+ this.$modal.showToast(`请选择${this.type=='DEVICE'||this.type == 'TECH'?'设备' : '模具'}名称`)
return;
}
if (!this.form.factoryAreaName) {
@@ -125,8 +125,7 @@
deviceNumber: this.form.deviceNumber,
factoryAreaNumber: this.form.factoryAreaNumber,
classes: this.form.classes,
- faultType: this.form.faultType,
- type: this.type
+ faultType: this.form.faultType
}
if (this.form.id) {
this.$modal.confirm('是否修改维修工单').then(() => {
@@ -176,10 +175,9 @@
// 重置
reset() {
if (this.form.id) {
- this.form.classes = '';
- this.form.faultType = ''
+ this.form.classes = undefined;
+ this.form.faultType = undefined
} else {
-
this.form = {}
}
},
@@ -209,7 +207,6 @@
this.form[this.field] = e[0].value
if (this.field == 'deviceNumber') {
this.choosesingleColumnItem = this.singleColumnList.filter(item => item.number == e[0].value)
- console.log(this.choosesingleColumnItem)
this.form.factoryAreaName = this.choosesingleColumnItem[0].factoryAreaName
this.form.factoryAreaNumber = this.choosesingleColumnItem[0].factoryAreaNumber
this.form.deviceName = this.choosesingleColumnItem[0].name
diff --git a/src/pages/repairOrder/addServiceRecord.vue b/src/pages/repairOrder/addServiceRecord.vue
index b2a1621..21da41a 100644
--- a/src/pages/repairOrder/addServiceRecord.vue
+++ b/src/pages/repairOrder/addServiceRecord.vue
@@ -75,7 +75,7 @@
-
+
@@ -127,7 +127,7 @@
selecUserList: [], //维修人员
isShowSelecUser: false,
form: {
- maintenanceNumber: '',
+ number: '',
describes: '',
describes1: '',
workOut: '',
@@ -311,7 +311,7 @@
this.$modal.showToast('请选择备件')
return;
}
- if (!this.form1.qty) {
+ if (!this.form1.qty||this.form1.qty ==0) {
this.$modal.showToast('请输入数量')
return;
}
@@ -336,7 +336,7 @@
async onLoad(option) {
if (option.type) this.type = option.type;
if (option.factoryAreaNumber) this.factoryAreaNumber = option.factoryAreaNumber;
- if (option.number) this.form.maintenanceNumber = option.number;
+ if (option.number) this.form.number = option.number;
if (option.data && JSON.parse(decodeURIComponent(option.data)) && JSON.parse(decodeURIComponent(option
.data)).id) {
this.form = JSON.parse(decodeURIComponent(option.data))
diff --git a/src/pages/repairOrder/detail.vue b/src/pages/repairOrder/detail.vue
index acdf3b5..f1775d0 100644
--- a/src/pages/repairOrder/detail.vue
+++ b/src/pages/repairOrder/detail.vue
@@ -4,7 +4,9 @@
维修工单
- 转办
+ 转办
+
@@ -23,35 +25,35 @@
故障类型：
{{data.faultTypeName}}
-
-
+
+
创建时间：
- {{deviceInfo.typeName}}
+ {{$time.formatDate(data.createTime)}}
-
+
创建人员：
- {{deviceInfo.typeName}}
+ {{data.creator}}
-
+
接单时间：
- {{deviceInfo.typeName}}
+ {{$time.formatDate(data.receivingTime)}}
-
-
+
+
接单人员：
- {{deviceInfo.maintenanceName}}
+ {{data.maintenanceName}}
-
+
完成时间：
- {{deviceInfo.typeName}}
+ {{$time.formatDate(data.completionTime)}}
-
+
验证时间：
- {{deviceInfo.typeName}}
+ {{$time.formatDate(data.verifyTime)}}
-
+
验证人员：
- {{deviceInfo.typeName}}
+ {{data.verifyer}}
@@ -66,25 +68,25 @@
{{changeItem.name}}
-
+
设备编号：
- {{deviceInfo.number}}
+ {{data1.deviceNumber}}
设备名称：
- {{deviceInfo.name}}
+ {{data1.name}}
所属厂区：
- {{deviceInfo.factoryAreaName}}
+ {{data1.factoryAreaName}}
设备类型：
- {{deviceInfo.typeName}}
+ {{data1.type == 'DEVICE'?'设备':data1.type == 'TECH'?'工艺':'模具'}}
-
+
报修单号：
{{data1.number}}
@@ -101,15 +103,13 @@
报修时间：
{{data1.describes}}
-
-
-
- {{data1.filePathList}}
-
-
+
+
+
-
+
@@ -117,7 +117,7 @@
{{item.describes}}
-
@@ -149,7 +149,8 @@
-
+
添加维修内容
@@ -157,13 +158,15 @@
@@ -171,8 +174,7 @@