From 5710f6d9a5ac5998d8368bec99b41c58fa3c4ab2 Mon Sep 17 00:00:00 2001 From: 86134 <aa> Date: 星期四, 09 十一月 2023 09:21:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/quality/finishedProductInspection/finishedProduct-form.vue | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue index 17c5246..03d109d 100644 --- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue +++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue @@ -75,8 +75,13 @@ </div> </el-form> </div> - <div class="finishedProduct-detail"> + + + + + <div class="finishedProduct-detail" v-if="resultVal!=null && processInspectVo.id!=null" > <el-row style="width:100%;z-index: 10;height:30px;"> + <el-col :span="12" class="inspectionProject_span" @click="increase">娣诲姞</el-col> <el-col :span="12" class="inspectionProject_span">妫�楠岄」鐩�</el-col> <el-col v-if="resultVal==null" :span="12" class="inspectionProject_span" style="text-align: right;"> <el-button size="mini" @click="clickAddInspectionColumn()">娣诲姞妫�娴嬪�煎垪</el-button> @@ -177,6 +182,40 @@ </el-col> </el-row> </div> + <div v-else> + + </div> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <div class="finishedProduct-result"> <el-row style="width:100%"> <el-col :span="24">妫�娴嬬粨鏋�</el-col> -- Gitblit v1.9.3