From 5316c506119ad056a5640650e5e79babe4194d38 Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期四, 25 四月 2024 20:33:31 +0800 Subject: [PATCH] - --- jcdm-ui/src/views/main/em/inspectionPlan/index.vue | 72 +++++++++++++++++++++++++++++++----- 1 files changed, 62 insertions(+), 10 deletions(-) diff --git a/jcdm-ui/src/views/main/em/inspectionPlan/index.vue b/jcdm-ui/src/views/main/em/inspectionPlan/index.vue index 6ff1b90..47d0e5f 100644 --- a/jcdm-ui/src/views/main/em/inspectionPlan/index.vue +++ b/jcdm-ui/src/views/main/em/inspectionPlan/index.vue @@ -94,23 +94,32 @@ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> - <el-table border v-loading="loading" :data="inspectionPlanList" @selection-change="handleSelectionChange" @inSelected="inMachineryAdd"> + <el-table border v-loading="loading" :data="inspectionPlanList" @selection-change="handleSelectionChange" > <el-table-column type="selection" width="55" align="center" /> <el-table-column label="璁″垝鍚嶇О" align="center" prop="planName"> </el-table-column> <el-table-column label="璁″垝缂栧彿" align="center" prop="planCode"> </el-table-column> <el-table-column label="璁″垝绫诲瀷" align="center" prop="planType"> + <template slot-scope="scope"> + <dict-tag :options="dict.type.plan_type" :value="scope.row.planType"/> + </template> </el-table-column> <el-table-column label="棰戠巼" align="center" prop="frequency"> </el-table-column> <el-table-column label="缁村害" align="center" prop="dimension"> + <template slot-scope="scope"> + <dict-tag :options="dict.type.dimension" :value="scope.row.dimension"/> + </template> </el-table-column> <el-table-column label="寮�濮嬫椂闂�" align="center" prop="startTime"> </el-table-column> <el-table-column label="缁撴潫鏃堕棿" align="center" prop="endTime"> </el-table-column> <el-table-column label="鐘舵��" align="center" prop="state"> + <template slot-scope="scope"> + <dict-tag :options="dict.type.plan_status" :value="scope.row.state"/> + </template> </el-table-column> <el-table-column label="涓婃鐢熸垚鏃堕棿" align="center" prop="lastGenerationTime"> </el-table-column> @@ -151,7 +160,6 @@ <el-form-item label="鐘舵��" prop="state"> <el-radio-group style="width: 450px" v-model="form.status"> <el-radio - v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.value" @@ -206,22 +214,23 @@ </el-form> <el-tabs type="border-card" > <el-tab-pane label="璁惧娓呭崟" > - <Checkmachinery ref="machinerylist" ></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 type="primary" @click="cs">娴� 璇�</el-button> </el-dialog> </div> </template> <script> import { listInspectionPlan, getInspectionPlan, delInspectionPlan, addInspectionPlan, updateInspectionPlan } from "@/api/main/em/inspectionPlan/inspectionPlan"; +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" @@ -229,6 +238,7 @@ name: "InspectionPlan", dicts: ['plan_status','plan_type','dimension'], components:{Checkmachinery,Checksubject}, + data() { return { // 閬僵灞� @@ -237,6 +247,7 @@ optType: null, // 閫変腑鏁扮粍 ids: [], + planCodes: [], // 闈炲崟涓鐢� single: true, // 闈炲涓鐢� @@ -247,6 +258,8 @@ total: 0, // 鐐规淇濆吇璁″垝琛ㄦ牸鏁版嵁 inspectionPlanList: [], + machineryList: [], + subjectList: [], // 寮瑰嚭灞傛爣棰� title: "", // 鏄惁鏄剧ず寮瑰嚭灞� @@ -334,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 => { @@ -347,6 +369,7 @@ cancel() { this.open = false; this.reset(); + this.clearCheckmachineryList() }, // 琛ㄥ崟閲嶇疆 reset() { @@ -375,9 +398,16 @@ }; this.resetForm("form"); }, - /** 娴嬭瘯鎸夐挳 */ - cs(){ - this.$emit('inSelected',this.planCode); + + onMachineryAdd(checkmachineryList){ + if(checkmachineryList !=null && checkmachineryList.length >0){ + this.machineryList = checkmachineryList + } + }, + subMachineryAdd(checksubjectList){ + if(checksubjectList !=null && checksubjectList.length >0){ + this.subjectList = checksubjectList + } }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { @@ -388,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) { @@ -411,6 +445,20 @@ this.titleName = "淇敼鐐规淇濆吇璁″垝"; }); }, + /** 瀛愯〃娓呭崟鏂板 */ + 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 => { @@ -421,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