Commit 5a0c4f07 authored by 张伯涛's avatar 张伯涛

修改

parent 1fdc9f58
...@@ -202,7 +202,8 @@ body .el-table th.gutter{ ...@@ -202,7 +202,8 @@ body .el-table th.gutter{
color: #D20A10; color: #D20A10;
} }
.el-message--error .el-message__content{ .el-message--error .el-message__content{
height: 400px; max-height: 400px;
min-height: 16px;
overflow-y: auto; overflow-y: auto;
} }
// confirm确定按钮颜色样式 // confirm确定按钮颜色样式
......
...@@ -187,8 +187,8 @@ export default { ...@@ -187,8 +187,8 @@ export default {
// 搜索框数据 // 搜索框数据
queryParams: { queryParams: {
// startDate: '2022-06-13', // startDate: '2022-06-13',
startDate: moment(date).format('YYYY-MM-DD') + ' 00:00:00', startDate: moment(date).format('YYYY-MM-DD') + ' 07:00:00',
endDate: moment(date.setTime(date.getTime() + 3600 * 1000 * 24)).format('YYYY-MM-DD') + ' 00:00:00' endDate: moment(date.setTime(date.getTime() + 3600 * 1000 * 24)).format('YYYY-MM-DD') + ' 07:00:00'
}, },
// 表格数据 // 表格数据
indexList: [ indexList: [
......
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</div> </div>
<el-row :gutter="20"> <el-row :gutter="20">
<!--选择成品料号数据--> <!--选择成品料号数据-->
<el-col :span="24" :xs="24" style="height: 300px"> <el-col :span="24" :xs="24">
<div style="float: left;margin: 10px;font-size: 14px;font-weight: 700;"> <div style="float: left;margin: 10px;font-size: 14px;font-weight: 700;">
配置物料列表 配置物料列表
</div> </div>
...@@ -1529,6 +1529,9 @@ export default { ...@@ -1529,6 +1529,9 @@ export default {
</style> </style>
<style lang="scss"> <style lang="scss">
.model_details { .model_details {
.el-dialog__wrapper .el-dialog .el-dialog__body{
max-height: 81vh;
}
.detailsSearch{ .detailsSearch{
.el-form-item--small .el-form-item__label{ .el-form-item--small .el-form-item__label{
line-height: 17px; line-height: 17px;
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
style="width: 150px" style="width: 150px"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
:picker-options="pickerOptions" :picker-options="pickerOptions"
/> />
</el-form-item> </el-form-item>
...@@ -118,15 +119,15 @@ ...@@ -118,15 +119,15 @@
{{ scope.row.createDate || '-' }} {{ scope.row.createDate || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" prop="createBy" :show-overflow-tooltip="true">--> <!-- <el-table-column align="center" prop="createBy" :show-overflow-tooltip="true">-->
<!-- <template slot="header">--> <!-- <template slot="header">-->
<!-- <div>报修人</div>--> <!-- <div>报修人</div>-->
<!-- <div>Operator</div>--> <!-- <div>Operator</div>-->
<!-- </template>--> <!-- </template>-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- {{ scope.row.createBy || '-' }}--> <!-- {{ scope.row.createBy || '-' }}-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column align="center" width="100" prop="flag"> <el-table-column align="center" width="100" prop="flag">
<template slot="header"> <template slot="header">
<div>状态</div> <div>状态</div>
...@@ -204,7 +205,7 @@ ...@@ -204,7 +205,7 @@
<el-input v-model="form.maintainCode" :disabled="true" /> <el-input v-model="form.maintainCode" :disabled="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<el-form-item label="报修工站" prop="stationName" :show-overflow-tooltip="true"> <el-form-item label="报修工站" prop="stationName" :show-overflow-tooltip="true">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div class="labelName">报修工站</div> <div class="labelName">报修工站</div>
...@@ -334,6 +335,7 @@ ...@@ -334,6 +335,7 @@
<script> <script>
import { getDicts } from '@/api/system/dict/data' import { getDicts } from '@/api/system/dict/data'
import { listRepairRecord, listRepairRecordDetails } from '@/api/repairRecord' import { listRepairRecord, listRepairRecordDetails } from '@/api/repairRecord'
import moment from 'moment'
export default { export default {
name: 'RepairRecord', name: 'RepairRecord',
...@@ -351,7 +353,7 @@ export default { ...@@ -351,7 +353,7 @@ export default {
rows: 10, rows: 10,
repairNo: '', repairNo: '',
sn: '', sn: '',
createdDate: '' createdDate: moment(new Date()).format('YYYY-MM-DD')
}, },
pickerOptions: { pickerOptions: {
disabledDate(time) { disabledDate(time) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment