From 99f9490544129ec3eea23d0d04d25dffba00a094 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Fri, 6 Jun 2025 18:28:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E4=BF=AE=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/equipment/Repair/index.vue | 6 +++--
src/pages/equipment/Repairbx/index.vue | 32 +++++++++++++++++++-------
src/pages/equipment/Repairbx/model.ts | 6 +++--
3 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/pages/equipment/Repair/index.vue b/src/pages/equipment/Repair/index.vue
index 85a4a63..36ce972 100644
--- a/src/pages/equipment/Repair/index.vue
+++ b/src/pages/equipment/Repair/index.vue
@@ -16,7 +16,8 @@
设备编码: {{ item.equipmentCode }}
- 产线: {{ item.planProdLine }}
+ 设备名称: {{ item.equipmentName }}
+ 产线: {{ item.bindEquipmentName }}
维修负责人: {{ item.workPerson }}
故障描述: {{ item.workFaultDesc }}
维修人员: {{ item.workPerson }}
@@ -32,7 +33,8 @@
设备编码: {{ item.equipmentCode }}
- 产线: {{ item.planProdLine }}
+ 设备名称: {{ item.equipmentName }}
+ 产线: {{ item.bindEquipmentName }}
维修负责人: {{ item.workPerson }}
故障描述: {{ item.workFaultDesc }}
维修人员: {{ item.workPerson }}
diff --git a/src/pages/equipment/Repairbx/index.vue b/src/pages/equipment/Repairbx/index.vue
index 5cf40cd..7e53876 100644
--- a/src/pages/equipment/Repairbx/index.vue
+++ b/src/pages/equipment/Repairbx/index.vue
@@ -18,9 +18,9 @@
查询
-
- 选择
-
+
+
+
@@ -44,6 +44,10 @@
+
+
+
+
@@ -142,6 +146,7 @@ export default class ChangePalletNew extends BasePage {
equipmentLocation: '',
orderDesc: '',
orderBreakdownTime: '',
+ attr1: '',
fileList: '',
orderRepairman: '',
};
@@ -150,11 +155,11 @@ export default class ChangePalletNew extends BasePage {
showtime = false;
defaulttime: any = '';
orderDesc: any = {};
+ newSelect: any = {};
async onReady() {
this.defaulttime = moment().format('YYYY-MM-DD HH:mm:ss');
console.log(this.defaulttime);
// await this.model.getDictList();
- await this.model.getFaultDescriptionList();
//this.remove = this.model.WlList[0];
}
onShow() {
@@ -203,7 +208,11 @@ export default class ChangePalletNew extends BasePage {
this.isaccord = true;
}
}
- //console.log('this.orderNoItemList', this.orderNoItemList);
+ const equipmentTypeCode = model.orderNoItemList.equipmentTypeCode;
+ let params = {
+ attr1: equipmentTypeCode,
+ };
+ await this.model.getFaultDescriptionList(params);
}
selscteq() {
uni.navigateTo({
@@ -239,13 +248,20 @@ export default class ChangePalletNew extends BasePage {
});
return;
}
- if (this.orderDesc.value == '' || this.orderDesc.value == undefined) {
+ if ((this.orderDesc.value == '' || this.orderDesc.value == undefined) && (this.formdata.attr1 == '' || this.formdata.attr1 == undefined)) {
(this.$refs.uToast as any).show({
- title: '故障描述不能为空',
+ title: '故障描述或补充必须填写一项',
type: 'default',
});
return;
}
+ // if (this.orderDesc.value == '' || this.orderDesc.value == undefined) {
+ // (this.$refs.uToast as any).show({
+ // title: '故障描述不能为空',
+ // type: 'default',
+ // });
+ // return;
+ // }
if (this.formdata.orderBreakdownTime == '' || this.formdata.orderBreakdownTime == undefined) {
(this.$refs.uToast as any).show({
title: '请输入故障时间',
@@ -260,7 +276,7 @@ export default class ChangePalletNew extends BasePage {
equipmentCode: this.formdata.equipmentCode,
equipmentName: this.formdata.equipmentName,
equipmentLocation: this.formdata.equipmentLocation,
- orderDesc: this.orderDesc.value,
+ orderDesc: this.orderDesc.value ? this.orderDesc.value : this.formdata.attr1,
orderBreakdownTime: this.formdata.orderBreakdownTime,
fileList: fileList,
orderSource: '手持PDA',
diff --git a/src/pages/equipment/Repairbx/model.ts b/src/pages/equipment/Repairbx/model.ts
index 064fbf9..90db823 100644
--- a/src/pages/equipment/Repairbx/model.ts
+++ b/src/pages/equipment/Repairbx/model.ts
@@ -40,8 +40,10 @@ export class Repairbx extends VuexModule {
// 故障描述
locList: any = [];
@MutationAction
- async getFaultDescriptionList() {
- const result: any = await http.get(url.lanjuequipment.product.Repair.getFaultDescriptionList);
+ async getFaultDescriptionList(params: any) {
+ const result: any = await http.get(url.lanjuequipment.product.Repair.getFaultDescriptionList, {
+ params,
+ });
const DictListoild: [] = result.data;
const locList = DictListoild.map((item: any) => ({
label: item.faultSubclass,