From 995a733a26dd1856c0dd7286f2dcde5ca1434bca Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 21 三月 2024 08:18:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/em/inspectionPlan/index.vue | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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..e601391 100644
--- a/jcdm-ui/src/views/main/em/inspectionPlan/index.vue
+++ b/jcdm-ui/src/views/main/em/inspectionPlan/index.vue
@@ -217,20 +217,20 @@
<Checkmachinery ref="machinerylist" @inSelected="onMachineryAdd"></Checkmachinery>
</el-tab-pane>
<el-tab-pane label="鐐规椤圭洰">
- <Checksubject ref="subjectlist"></Checksubject>
+ <Checksubject ref="subjectlist" @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"
@@ -257,6 +257,7 @@
// 鐐规淇濆吇璁″垝琛ㄦ牸鏁版嵁
inspectionPlanList: [],
machineryList: [],
+ subjectList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -391,6 +392,11 @@
this.machineryList = checkmachineryList
}
},
+ subMachineryAdd(checksubjectList){
+ if(checksubjectList !=null && checksubjectList.length >0){
+ this.subjectList = checksubjectList
+ }
+ },
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
@@ -423,14 +429,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,12 +453,14 @@
this.open = false;
this.getList();
});
+ this.checkAdd()
} else {
addInspectionPlan(this.form).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
});
+ this.checkAdd()
}
}
});
--
Gitblit v1.9.3