From 06713afdb80bc876ffc6a09442049a08eb8a2364 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 09 五月 2024 14:36:28 +0800
Subject: [PATCH] -

---
 jcdm-ui/src/views/main/em/inspectionPlan/index.vue |   48 ++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/jcdm-ui/src/views/main/em/inspectionPlan/index.vue b/jcdm-ui/src/views/main/em/inspectionPlan/index.vue
index b4b7d6c..47d0e5f 100644
--- a/jcdm-ui/src/views/main/em/inspectionPlan/index.vue
+++ b/jcdm-ui/src/views/main/em/inspectionPlan/index.vue
@@ -214,23 +214,23 @@
       </el-form>
       <el-tabs type="border-card" >
         <el-tab-pane label="璁惧娓呭崟" >
-          <Checkmachinery ref="machinerylist"  @inSelected="onMachineryAdd"></Checkmachinery>
+          <Checkmachinery ref="machinerylist"  :id="form.id" :planCode="form.planCode" @inSelected="onMachineryAdd" ></Checkmachinery>
         </el-tab-pane>
         <el-tab-pane label="鐐规椤圭洰">
-          <Checksubject ref="subjectlist"></Checksubject>
+          <Checksubject ref="subjectlist"    :id="form.id"  @subSelected="subMachineryAdd"></Checksubject>
             </el-tab-pane>
           </el-tabs>
       <el-divider></el-divider>
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
         <el-button @click="cancel">鍙� 娑�</el-button>
-      <el-button @click="checkMachineryAdd">娴嬭瘯</el-button>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listInspectionPlan, getInspectionPlan, delInspectionPlan, addInspectionPlan, updateInspectionPlan } from "@/api/main/em/inspectionPlan/inspectionPlan";
-import { listInspectionPlanArchives, delInspectionPlanArchives, addInspectionPlanArchives} from "@/api/main/em/inspectionPlanArchives/inspectionPlanArchives";
+import { listInspectionPlanArchives, delInspectionPlanArchives, addInspectionPlanArchives,getInspectionPlanArchives} from "@/api/main/em/inspectionPlanArchives/inspectionPlanArchives";
+import {listInspectionPlanItems,delInspectionPlanItems,addInspectionPlanItems,getInspectionPlanItems} from "@/api/main/em/inspectionPlanItems/inspectionPlanItems";
 import Checkmachinery from "./machinery.vue"
 import Checksubject from "./subject.vue"
 
@@ -238,6 +238,7 @@
   name: "InspectionPlan",
   dicts: ['plan_status','plan_type','dimension'],
   components:{Checkmachinery,Checksubject},
+
   data() {
     return {
       // 閬僵灞�
@@ -246,6 +247,7 @@
       optType: null,
       // 閫変腑鏁扮粍
       ids: [],
+      planCodes: [],
       // 闈炲崟涓鐢�
       single: true,
       // 闈炲涓鐢�
@@ -257,6 +259,7 @@
       // 鐐规淇濆吇璁″垝琛ㄦ牸鏁版嵁
       inspectionPlanList: [],
       machineryList: [],
+      subjectList: [],
       // 寮瑰嚭灞傛爣棰�
       title: "",
       // 鏄惁鏄剧ず寮瑰嚭灞�
@@ -344,7 +347,16 @@
     this.getList();
   },
   methods: {
-    /** 鏌ヨ鐐规淇濆吇璁″垝鍒楄〃 */
+    clearCheckmachineryList(){
+      this.$refs.machinerylist.clearCheckmachineryList()
+    },
+    clearSubjectList() {
+      this.subjectList = [];
+    },
+    clearMachineryList(){
+      this.machineryList =[];
+    },
+      /** 鏌ヨ鐐规淇濆吇璁″垝鍒楄〃 */
     getList() {
       this.loading = true;
       listInspectionPlan(this.queryParams).then(response => {
@@ -357,6 +369,7 @@
     cancel() {
       this.open = false;
       this.reset();
+      this.clearCheckmachineryList()
     },
     // 琛ㄥ崟閲嶇疆
     reset() {
@@ -391,6 +404,11 @@
         this.machineryList = checkmachineryList
       }
     },
+    subMachineryAdd(checksubjectList){
+      if(checksubjectList !=null && checksubjectList.length >0){
+        this.subjectList = checksubjectList
+      }
+    },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -400,18 +418,22 @@
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
+
     },
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.planCode =selection.map(item => item.planCode)
       this.single = selection.length!==1
       this.multiple = !selection.length
+      console.log(this.planCode)
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
       this.reset();
       this.open = true;
       this.titleName = "娣诲姞鐐规淇濆吇璁″垝";
+      console.log(this.machineryList)
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
@@ -423,14 +445,20 @@
         this.titleName = "淇敼鐐规淇濆吇璁″垝";
       });
     },
-    /** 璁惧娓呭崟鏂板 */
-    checkMachineryAdd(){
+    /** 瀛愯〃娓呭崟鏂板 */
+    checkAdd(){
       for (let i = 0; i < this.machineryList.length; i++) {
         this.machineryList[i].planCode = this.form.planCode
         addInspectionPlanArchives(this.machineryList[i]).then(response =>{
         });
       }
+      for (let i = 0; i < this.subjectList.length; i++) {
+        this.subjectList[i].planCode = this.form.planCode
+        addInspectionPlanItems(this.subjectList[i]).then(response =>{
+        });
+      }
     },
+
     /** 鎻愪氦鎸夐挳 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -441,16 +469,20 @@
               this.open = false;
               this.getList();
             });
+            this.checkAdd()
           } else {
             addInspectionPlan(this.form).then(response => {
               this.$modal.msgSuccess("鏂板鎴愬姛");
               this.open = false;
               this.getList();
             });
+            this.checkAdd()
           }
         }
       });
-
+      this.clearSubjectList();
+      this.clearMachineryList();
+      this.clearCheckmachineryList()
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {

--
Gitblit v1.9.3