From 0ba75db34c554959c6bc566a38a22db34913c797 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期三, 06 九月 2023 17:38:49 +0800 Subject: [PATCH] modified: src/views/CNAS/nonConformanceManage/index.vue modified: src/views/CNAS/reviewAnnualPlan/index.vue modified: src/views/CNAS/satisfactionSurveys/index.vue modified: src/views/basicData/index.vue modified: src/views/chart/work/index.vue modified: src/views/experiment/checkTheReport/index.vue modified: src/views/experiment/inspectionApplication/index.vue modified: src/views/experiment/nonConformingFeedback/index.vue modified: src/views/experiment/passRateStatistics/index.vue modified: src/views/experiment/planAssignments/plan.vue modified: src/views/experiment/reportAuditing/index.vue modified: src/views/inspectionManagement/commissionInspection/index.vue modified: src/views/inspectionManagement/reportForInspection/index.vue modified: src/views/laboratory/gather/index.vue modified: src/views/laboratory/ledger/index.vue modified: src/views/laboratory/measure/index.vue modified: src/views/laboratory/personnel/index.vue modified: src/views/laboratory/role/index.vue modified: src/views/message/toDo/index.vue modified: src/views/standardLibrary/index.vue --- src/views/experiment/planAssignments/plan.vue | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue index 8742464..0b9cb4f 100644 --- a/src/views/experiment/planAssignments/plan.vue +++ b/src/views/experiment/planAssignments/plan.vue @@ -44,18 +44,23 @@ <template> <div class="plan"> <div class="title"> - <span>鐢宠鍗曠紪鍙凤細</span> - <el-input v-model="search.code" size="medium" style="width: 200px;margin-right: 20px;"></el-input> - <span>妫�楠屾椂闂达細</span> - <el-date-picker v-model="search.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" - end-placeholder="缁撴潫鏃ユ湡" size="medium" value-format="yyyy-MM-dd" style="margin-right: 20px;"> - </el-date-picker> - <span>妫�楠岀粨鏋滐細</span> - <el-select v-model="search.testValue" size="medium" style="width: 200px;margin-right: 20px;"> - <el-option label="鍏ㄩ儴" :value="null"></el-option> - <el-option label="鍚堟牸" :value="1"></el-option> - <el-option label="涓嶅悎鏍�" :value="0"></el-option> - </el-select> + <el-form :model="search" :inline="true" label-position="left"> + <el-form-item prop="code" label="鐢宠鍗曠紪鍙凤細" width="200" style="margin: 20px 10px;"> + <el-input v-model="search.code" size="small" ></el-input> + </el-form-item> + <el-form-item prop="date" label="妫�楠屾椂闂达細" width="200" style="margin: 20px 10px;"> + <el-date-picker v-model="search.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" + end-placeholder="缁撴潫鏃ユ湡" size="small" value-format="yyyy-MM-dd" style="margin-right: 20px;"> + </el-date-picker> + </el-form-item> + <el-form-item prop="testValue" label="妫�楠岀粨鏋滐細" width="200" style="margin: 20px 10px;"> + <el-select v-model="search.testValue" size="small"> + <el-option label="鍏ㄩ儴" :value="null"></el-option> + <el-option label="鍚堟牸" :value="1"></el-option> + <el-option label="涓嶅悎鏍�" :value="0"></el-option> + </el-select> + </el-form-item> + </el-form> <el-button size="small" type="primary" @click="selectDataList">鏌ヨ</el-button> <el-button size="small" @click="cleanBtn">閲嶇疆</el-button> </div> @@ -111,9 +116,9 @@ <el-button size="mini" :disabled="!isIfReport(scope.row)" type="primary" v-if="scope.row.orderNum == '01'" @click="addReported(scope.row.id)">涓婃姤</el-button> <el-button size="mini" type="text" @click="openUpDia(scope.row)" - v-if="scope.row.orderNum=='02'">鍒嗛厤</el-button> + v-if="scope.row.orderNum=='02'&&scope.row.children==undefined&&scope.row.testState==null">鍒嗛厤</el-button> <el-button size="mini" type="text" @click="openUpInsDia(scope.row)" - v-if="scope.row.orderNum=='02'">妫�楠�</el-button> + v-if="scope.row.orderNum=='02'&&scope.row.children==undefined&&scope.row.testState==null">妫�楠�</el-button> </template> </el-table-column> </el-table> -- Gitblit v1.9.3