From b095b6a12ae03323ac576ade81edd1c5e5a33c56 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Mon, 11 Dec 2023 09:10:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/device/upkeepPlan.js           |  8 ++++++++
 src/views/device/upkeepOrder/index.vue |  4 ++--
 src/views/device/upkeepPlan/index.vue  | 25 ++++++++++++++++++-------
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/api/device/upkeepPlan.js b/src/api/device/upkeepPlan.js
index 6f03617..fdd6297 100644
--- a/src/api/device/upkeepPlan.js
+++ b/src/api/device/upkeepPlan.js
@@ -17,6 +17,14 @@ export function formatEquItem(data) {
     data: data
   });
 }
+// 处理计划-设备信息
+export function formatEquItemNoCondition(data) {
+  return request({
+    url: '/device/upkeepPlan/formatEquItemNoCondition',
+    method: 'post',
+    data: data
+  });
+}
 
 // 查询保养计划列表
 export function listUpkeepPlan(query) {
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index 1df03c0..615f92f 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -1169,7 +1169,7 @@ import {
   addUpkeepOrder,
   updateUpkeepOrder, subInspect
 } from "@/api/device/upkeepOrder";
-import {formatEquItem, querySpareList} from "@/api/device/upkeepPlan";
+import {formatEquItem, formatEquItemNoCondition, querySpareList} from "@/api/device/upkeepPlan";
 import {getEquList, getPersonList, getWorkCenter} from "@/api/device/plan";
 import {delDeviceOrder, getDeviceOrder, listDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder";
 import {getInspectionWork, updateInspectionWork} from "@/api/device/inspectionWork";
@@ -1636,7 +1636,7 @@ export default {
 
       this.form.equipmentItem = [];
       // 处理信息
-      formatEquItem(this.selectEquList).then(response => {
+      formatEquItemNoCondition(this.selectEquList).then(response => {
 
         for (let i = 0; i < response.data.length; i++) {
           this.form.equipmentItem.push(response.data[i]);
diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue
index be0c414..e79f265 100644
--- a/src/views/device/upkeepPlan/index.vue
+++ b/src/views/device/upkeepPlan/index.vue
@@ -873,7 +873,7 @@ import {
   delUpkeepPlan,
   addUpkeepPlan,
   updateUpkeepPlan,
-  formatEquItem, setSpareList, querySpareList
+  formatEquItem, setSpareList, querySpareList, formatEquItemNoCondition
 } from "@/api/device/upkeepPlan";
 import {
   addPlan,
@@ -1401,14 +1401,25 @@ export default {
       }
 
       // 处理信息
-      formatEquItem(this.selectEquList).then(response => {
+      if (this.form.calculationRule == "2"){
+        formatEquItem(this.selectEquList).then(response => {
 
-        for (let i = 0; i < response.data.length; i++) {
-          this.form.equipmentItem.push(response.data[i]);
-        }
+          for (let i = 0; i < response.data.length; i++) {
+            this.form.equipmentItem.push(response.data[i]);
+          }
 
-        this.selectEqu = false;
-      })
+          this.selectEqu = false;
+        })
+      }else {
+        formatEquItemNoCondition(this.selectEquList).then(response => {
+
+          for (let i = 0; i < response.data.length; i++) {
+            this.form.equipmentItem.push(response.data[i]);
+          }
+
+          this.selectEqu = false;
+        })
+      }
 
     },
     // 选择设备多选操作