diff --git a/src/views/check/oneTbale.vue b/src/views/check/oneTbale.vue index 9ad30ee81a3337b2396c9b4826f6401a74202c1c..805f8a5e00018dacba2386e40b592889f772a53f 100644 --- a/src/views/check/oneTbale.vue +++ b/src/views/check/oneTbale.vue @@ -1,7 +1,7 @@ <template> <div class="app-container"> - <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true"> - <el-form-item label="å•å·" prop="jcCode"> + <el-form class="upperBody" ref="queryForm" :model="queryParams" :inline="true" > + <el-form-item label="å•å·" prop="jcCode" > <el-input v-model="queryParams.jcCode" placeholder="请输入å•å·" @@ -21,7 +21,7 @@ style="width: 150px" /> </el-form-item> - <el-form-item label="pn" prop="jcPn"> + <el-form-item label="pn" prop="jcPn" > <el-input v-model="queryParams.jcPn" placeholder="请输入pn" @@ -41,8 +41,8 @@ style="width: 150px" /> </el-form-item> - <el-form-item label="厂家" prop="jcCj"> - <el-select clearable v-model="queryParams.jcCj" class="normalSelect" placeholder="请选择厂家"> + <el-form-item class="normalTopInput" label="厂家" prop="jcCj"> + <el-select clearable v-model="queryParams.jcCj" placeholder="请选择厂家"> <el-option v-for="item in manufacturer" :key="item.value" @@ -51,7 +51,7 @@ /> </el-select> </el-form-item> - <el-form-item label="检查结果" prop="approveStatus" style="width: 22%"> + <el-form-item class="inspectTopSelect" label="检查结果" prop="approveStatus" > <el-select clearable v-model="queryParams.jcResult" placeholder="请选择"> <el-option v-for="item in resultOptions" @@ -61,7 +61,7 @@ /> </el-select> </el-form-item> - <el-form-item label="审批状æ€" prop="approveStatus" style="width: 22%"> + <el-form-item class="inspectTopStatus" label="审批状æ€" prop="approveStatus" > <el-select clearable v-model="queryParams.approveStatus" placeholder="请选择"> <el-option v-for="item in statusOptions" @@ -71,12 +71,12 @@ /> </el-select> </el-form-item> - <el-form-item label="æäº¤æ—¶é—´" prop="updateDate"> + <el-form-item class="submitTopTime" label="æäº¤æ—¶é—´" prop="updateDate"> <el-date-picker + class="timeForamt" clearable v-model="dateRange" size="small" - style="width: 210px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" @@ -85,7 +85,7 @@ @change="handleTimeChange" /> </el-form-item> - <el-form-item style="margin-left: 3%"> + <el-form-item style="margin-left: -10%"> <el-button :class="commonField.queryClass" :type="commonField.typePrimary" @@ -112,6 +112,7 @@ </el-form-item> </div> </el-form> + <div class="placeholder" /> <div style="padding:5px 10px"> <div class="mb12 font-small-bold">检查表列表</div> @@ -687,14 +688,45 @@ export default { } </script> <style lang="scss" scoped> + .app-container { font-size: 18px; padding: 0; + .upperBody{ + width: 100%; + height: 150px; + //border: 4px solid ; + padding-top: 1%; + padding-left: 1%; + .normalTopInput{ + margin-left: -2%; + ::v-deep .el-form-item__content{ + width: 70%; + } + } + .inspectTopSelect{ + margin-left: -4%; + padding-left: 2%; + } + .inspectTopStatus{ + ::v-deep .el-form-item__content{ + width: 61%; + } + } + .submitTopTime{ + margin-left: -3%; + .timeForamt{ + width: 61%; + } + } + } .placeholder { height: 1.3vh; background-color: #F4F4F4; - margin-bottom: 10px + //background-color: red; + margin-bottom: 10px; + margin-top:-2%; } } </style> diff --git a/src/views/checkList.vue b/src/views/checkList.vue index 16098f260e786f3a6764e609e9341a0abe23f4c6..a26de00d55880c345387ff901d3838ad6f2b4b38 100644 --- a/src/views/checkList.vue +++ b/src/views/checkList.vue @@ -1115,7 +1115,6 @@ export default { this.digitalFormat(this.calculationFormThird.Minimum = min) this.digitalFormat(this.calculationFormThird.Average = stingAverage) } - }, /* 表å•2的计算方法*/ @@ -1172,7 +1171,7 @@ export default { } } } - if (this.recode3[index].recordData === '') { + if (this.recode3[index].recordData === '' || this.inspectJbAl2o3List.limitOne === '' || this.inspectJbAl2o3List.limitTwo === '') { this.recode3[index].differenceValue = '' } if (index < this.recode3.length) { @@ -2128,12 +2127,13 @@ export default { //text-align: right; .scanDiv { width: 43%; - margin-left: 4%; + margin-left: 7%; } .fontSp { margin-left: 43%; height: 28px; + width: 11%; font-family: Microsoft YaHei, Microsoft YaHei-400; font-weight: 400; color: #606266; @@ -2547,6 +2547,19 @@ export default { margin-left: 10px; } } + .Value { + //margin-left: 20px; + //margin-top: 8px; + width: 64px; + height: 18px; + font-size: 14px; + font-family: Microsoft YaHei, Microsoft YaHei-400; + font-weight: 400; + text-align: LEFT; + color: #0057ff; + margin-left: 27%; + margin-top: 1%; + } }