From 5239031423deb80a31ac328838240adc51594804 Mon Sep 17 00:00:00 2001 From: 懒羊羊 <15939171744@163.com> Date: 星期六, 23 三月 2024 10:42:01 +0800 Subject: [PATCH] 点检任务 --- jcdm-ui/src/views/main/em/inspectionPlan/index.vue | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 55 insertions(+), 4 deletions(-) diff --git a/jcdm-ui/src/views/main/em/inspectionPlan/index.vue b/jcdm-ui/src/views/main/em/inspectionPlan/index.vue index f70b412..e601391 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"> + <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" @@ -204,25 +212,38 @@ <el-input style="width: 1000px" v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" /> </el-form-item> </el-form> - <div slot="footer" class="dialog-footer"> + <el-tabs type="border-card" > + <el-tab-pane label="璁惧娓呭崟" > + <Checkmachinery ref="machinerylist" @inSelected="onMachineryAdd"></Checkmachinery> + </el-tab-pane> + <el-tab-pane label="鐐规椤圭洰"> + <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> - </div> </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" export default { name: "InspectionPlan", dicts: ['plan_status','plan_type','dimension'], + components:{Checkmachinery,Checksubject}, data() { return { // 閬僵灞� loading: true, titleName: "", + optType: null, // 閫変腑鏁扮粍 ids: [], // 闈炲崟涓鐢� @@ -235,6 +256,8 @@ total: 0, // 鐐规淇濆吇璁″垝琛ㄦ牸鏁版嵁 inspectionPlanList: [], + machineryList: [], + subjectList: [], // 寮瑰嚭灞傛爣棰� title: "", // 鏄惁鏄剧ず寮瑰嚭灞� @@ -363,6 +386,17 @@ }; this.resetForm("form"); }, + + onMachineryAdd(checkmachineryList){ + if(checkmachineryList !=null && checkmachineryList.length >0){ + this.machineryList = checkmachineryList + } + }, + subMachineryAdd(checksubjectList){ + if(checksubjectList !=null && checksubjectList.length >0){ + this.subjectList = checksubjectList + } + }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { this.queryParams.pageNum = 1; @@ -395,6 +429,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 => { @@ -405,15 +453,18 @@ this.open = false; this.getList(); }); + this.checkAdd() } else { addInspectionPlan(this.form).then(response => { this.$modal.msgSuccess("鏂板鎴愬姛"); this.open = false; this.getList(); }); + this.checkAdd() } } }); + }, /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { -- Gitblit v1.9.3