From 7edce9d027ae6b4b17457baa9bbd900db9b32baf Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 03 三月 2025 15:01:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/device/component/failureForm.vue | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/failureForm.vue b/src/views/CNAS/resourceDemand/device/component/failureForm.vue
index f8fb193..70d0cf4 100644
--- a/src/views/CNAS/resourceDemand/device/component/failureForm.vue
+++ b/src/views/CNAS/resourceDemand/device/component/failureForm.vue
@@ -67,6 +67,11 @@
</template>
<script>
+import {
+ getDeviceBreakdownMaintenance,
+ addDeviceBreakdownMaintenance,
+} from '@/api/cnas/resourceDemand/device.js'
+import { selectUserCondition } from "@/api/business/inspectionTask";
export default {
name: "failure-form",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -115,7 +120,9 @@
},
// 鏌ヨ璇︽儏
searchInfo() {
- this.$axios.get(this.$api.deviceBreakdownMaintenance.getDeviceBreakdownMaintenance + '?maintenanceId=' + this.form.maintenanceId).then(res => {
+ getDeviceBreakdownMaintenance({
+ maintenanceId: this.form.maintenanceId
+ }).then(res => {
if (res.code === 200) {
this.form = { ...res.data }
if (this.form.isFinish === 0) {
@@ -144,13 +151,7 @@
this.form.flowType = this.currentStep
this.$refs.modelForm.validate((valid) => {
if (valid) {
- this.$axios.post(this.$api.deviceBreakdownMaintenance.addDeviceBreakdownMaintenance,
- this.form, {
- headers: {
- 'Content-Type': 'application/json'
- },
- noQs: true
- }).then(res => {
+ addDeviceBreakdownMaintenance(this.form).then(res => {
if (res.code == 200) {
this.$message.success('鏂板鎴愬姛')
this.resetForm()
@@ -168,18 +169,11 @@
this.$emit('closeDialog')
},
getUserList() {
- this.$axios.post(this.$api.user.selectUserList, {
- page: { current: -1, size: -1, },
- entity: { name: null }
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
+ selectUserCondition().then(res => {
if (res.code === 201) {
return
}
- this.userList = res.data.records
+ this.userList = res.data
})
},
},
--
Gitblit v1.9.3