From 7f6f725ad67e017c0bbae2a4de01952b88352af0 Mon Sep 17 00:00:00 2001 From: 懒羊羊 <15939171744@163.com> Date: 星期五, 15 三月 2024 10:52:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- jcdm-ui/src/views/main/em/inspectionPlan/index.vue | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 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..9d4346c 100644 --- a/jcdm-ui/src/views/main/em/inspectionPlan/index.vue +++ b/jcdm-ui/src/views/main/em/inspectionPlan/index.vue @@ -204,25 +204,36 @@ <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"></Checkmachinery> + </el-tab-pane> + <el-tab-pane label="鐐规椤圭洰"> + <Checksubject ref="subjectlist"></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 Checkmachinery from "./machinery.vue" +import Checksubject from "./subject.vue" export default { name: "InspectionPlan", - dicts: ['plan_status','plan_type','dimension'], + dicts: ['plan_status','plan_type'], + components:{Checkmachinery,Checksubject}, data() { return { // 閬僵灞� loading: true, titleName: "", + optType: null, // 閫変腑鏁扮粍 ids: [], // 闈炲崟涓鐢� -- Gitblit v1.9.3