From 97586104d7808d8ea8fb5f3e5d4c60e2a7943667 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 23 五月 2026 17:51:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/views/equipmentManagement/upkeep/Form/formDia.vue | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/views/equipmentManagement/upkeep/Form/formDia.vue b/src/views/equipmentManagement/upkeep/Form/formDia.vue
index 6856ae1..4b60954 100644
--- a/src/views/equipmentManagement/upkeep/Form/formDia.vue
+++ b/src/views/equipmentManagement/upkeep/Form/formDia.vue
@@ -101,7 +101,7 @@
<el-col :span="12" v-if="form.frequencyType === 'DAILY' && form.frequencyType">
<el-form-item label="鏃ユ湡" prop="frequencyDetail">
<el-time-picker v-model="form.frequencyDetail" placeholder="閫夋嫨鏃堕棿" format="HH:mm"
- value-format="HH:mm" />
+ value-format="HH:mm" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.frequencyType === 'WEEKLY' && form.frequencyType">
@@ -116,7 +116,7 @@
<el-option label="鍛ㄦ棩" value="SUN"/>
</el-select>
<el-time-picker v-model="form.time" placeholder="閫夋嫨鏃堕棿" format="HH:mm"
- value-format="HH:mm" style="width: 50%"/>
+ value-format="HH:mm" style="width: 50%"/>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.frequencyType === 'MONTHLY' && form.frequencyType">
@@ -141,6 +141,23 @@
format="MM,DD,HH:mm"
value-format="MM,DD,HH:mm"
/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="瀹氭椂浠诲姟">
+ <el-switch
+ v-model="form.isActive"
+ :active-value="1"
+ :inactive-value="0"
+ active-text="寮�鍚�"
+ inactive-text="鍏抽棴"
+ inline-prompt
+ />
+ <span style="margin-left: 12px; color: #909399; font-size: 12px;">
+ {{ form.isActive === 1 ? '浠诲姟灏嗘寜璁″垝鎵ц' : '浠诲姟鏆傚仠鎵ц' }}
+ </span>
</el-form-item>
</el-col>
</el-row>
@@ -184,7 +201,8 @@
time: '',
deviceModel: undefined, // 瑙勬牸鍨嬪彿
registrationDate: '',
- maintenancePerson: '' // 淇濆吇浜�
+ maintenancePerson: '', // 淇濆吇浜�
+ isActive: 0 // 瀹氭椂浠诲姟寮�鍏筹細0=鍏抽棴锛�1=寮�鍚�
},
rules: {
taskId: [{ required: true, message: "璇烽�夋嫨璁惧", trigger: "change" },],
@@ -271,7 +289,8 @@
time: '',
deviceModel: undefined,
registrationDate: '',
- maintenancePerson: ''
+ maintenancePerson: '',
+ isActive: 0
}
}
@@ -294,21 +313,21 @@
}
delete payload.inspector
delete payload.inspectorIds
-
+ delete payload.active
+
if (payload.frequencyType === 'WEEKLY') {
let frequencyDetail = ''
frequencyDetail = payload.week + ',' + payload.time
payload.frequencyDetail = frequencyDetail
}
-
+
// 褰曞叆鏃ユ湡锛氱洿鎺ヤ娇鐢ㄨ〃鍗曢噷鐨� registrationDate 瀛楁
// 涓�浜涢粯璁ょ姸鎬佸瓧娈�
if (payload.status === undefined || payload.status === null || payload.status === '') {
payload.status = '0' // 榛樿鐘舵�侊紝鍙寜瀹為檯鏋氫妇璋冩暣
}
- payload.active = true
payload.deleted = 0
-
+
if (operationType.value === 'edit') {
await deviceMaintenanceTaskEdit(payload)
} else {
--
Gitblit v1.9.3