|
@@ -33,16 +33,20 @@
|
|
|
<span v-if="cxtjFlag">
|
|
|
录入日期:
|
|
|
<el-date-picker
|
|
|
- v-model="queryParam.recDateStr"
|
|
|
- type="date"
|
|
|
+ v-model="queryParam.startRecTime"
|
|
|
+ type="datetime"
|
|
|
size="small"
|
|
|
:clearable="clearable"
|
|
|
- format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100px;"
|
|
|
+ format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="width: 150px;"
|
|
|
></el-date-picker>
|
|
|
- 时段
|
|
|
- <el-time-picker v-model="queryParam.startRecTime" style="width: 100px"/>
|
|
|
至
|
|
|
- <el-time-picker v-model="queryParam.endRecTime" style="width: 100px"/>
|
|
|
+ <el-date-picker
|
|
|
+ v-model="queryParam.endRecTime"
|
|
|
+ type="datetime"
|
|
|
+ size="small"
|
|
|
+ :clearable="clearable"
|
|
|
+ format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="width: 150px;"
|
|
|
+ ></el-date-picker>
|
|
|
</span>
|
|
|
<el-select v-model="queryParam.type" style="width: 60px;" @change="selectTongKong" size="small">
|
|
|
<el-option
|
|
@@ -362,17 +366,17 @@
|
|
|
</el-table-column>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="入量">
|
|
|
- <el-table-column label="项目" width="90" >
|
|
|
- <el-table-column prop="col1Name" label="ml.g" width="30" />
|
|
|
+ <el-table-column label="项目" >
|
|
|
+ <el-table-column prop="col1Name" label="ml.g" width="80" />
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="量" width="90" >
|
|
|
- <el-table-column prop="col1Am" label="ml" width="30" />
|
|
|
+ <el-table-column label="量" >
|
|
|
+ <el-table-column prop="col1Am" label="ml" width="40" />
|
|
|
</el-table-column>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="出量" >
|
|
|
<el-table-column prop="col2Name" label="项目" width="50" />
|
|
|
<el-table-column label="量" width="30" >
|
|
|
- <el-table-column prop="col2Am" label="ml" width="40" />
|
|
|
+ <el-table-column prop="col2Am" label="ml" width="45" />
|
|
|
</el-table-column>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="监测项目" >
|
|
@@ -783,7 +787,7 @@
|
|
|
|
|
|
|
|
|
<tr v-if="queryParam.hldType=='6'" v-for="(item,index) in hldPrintDataList">
|
|
|
- <td style="width: 40px">{{item.recDateStr}}</td>
|
|
|
+ <td style="width: 40px;">{{item.recDateStr}}</td>
|
|
|
<td style="width: 35px">{{item.recTimeStr}}</td>
|
|
|
<td style="width: 25px">{{item.temperature1Str}}</td>
|
|
|
<td style="width: 25px">{{item.heart}}</td>
|
|
@@ -796,7 +800,7 @@
|
|
|
{{item.pupilr}} {{item.pupil}} <br/> o{{item.pupilbj}}o <br/> {{item.rpupil}} {{item.lpupil}}
|
|
|
</span>
|
|
|
</td>
|
|
|
- <td style="width: 55px">{{item.col1Name}}</td>
|
|
|
+ <td style="width: 70px">{{item.col1Name}}</td>
|
|
|
<td style="width: 25px">{{item.col1Am}}</td>
|
|
|
<td style="width: 55px">{{item.col2Name}}</td>
|
|
|
<td style="width: 25px">{{item.col2Am}}</td>
|
|
@@ -816,7 +820,7 @@
|
|
|
<td style="width: 20px"> {{isForXuanZhong(item.isHuiyin)}}</td>
|
|
|
<td style="width: 20px"> {{isForXuanZhong(item.isBed)}}</td>
|
|
|
<td style="width: 20px"> {{isForXuanZhong(item.isAV)}}</td>
|
|
|
- <td style="width: 200px;text-align: left"> {{item.otherInfo}}</td>
|
|
|
+ <td style="width: 210px;text-align: left"> {{item.otherInfo}}</td>
|
|
|
<td > {{item.useridName}}</td>
|
|
|
</tr>
|
|
|
</tbody>
|
|
@@ -870,8 +874,7 @@ const showFlagClick = ()=>{
|
|
|
const tableHeight = ref(0)
|
|
|
const getCode = store.state.user.info.code
|
|
|
const queryParam =ref({
|
|
|
- recDateStr:getFormatDatetime(new Date(),'YYYY-MM-DD'),
|
|
|
- startRecTime:'',
|
|
|
+ startRecTime:getFormatDatetime(new Date(),'YYYY-MM-DD')+' 00:00:00',
|
|
|
endRecTime:'',
|
|
|
hldType:'1',
|
|
|
type:'0',
|
|
@@ -1225,7 +1228,7 @@ const daYingClick = () => {
|
|
|
LODOP.ADD_PRINT_TABLE('2mm', '2mm', '290mm', '180mm', '<style>' + yzPrintCss + '</style>' + '<body>' + document.getElementById('cqYz').innerHTML + '</body>')
|
|
|
LODOP.SET_SHOW_MODE("LANDSCAPE_DEFROTATED", 1)
|
|
|
LODOP.SET_PRINT_STYLE('ItemType', 3)
|
|
|
- LODOP.ADD_PRINT_TEXT('196mm', '137mm', '20mm', '7mm', '第#页/共&页')
|
|
|
+ LODOP.ADD_PRINT_TEXT('196mm', '130mm', '25mm', '10mm', '第#页/共&页')
|
|
|
LODOP.PREVIEW() // 关闭
|
|
|
}
|
|
|
|