From 76ae1cb964715cef4dc566092b9b17e8e5e51656 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 25 十月 2023 17:04:52 +0800
Subject: [PATCH] 验收单修改
---
src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue | 85 +++++++++++++++++++++++++-----------------
1 files changed, 51 insertions(+), 34 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 63ed876..b3e08fb 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -1,6 +1,6 @@
<template>
<div style="width: 100%;">
- <a-card :bordered="false">
+ <div :bordered="false">
<!-- 鏌ヨ鍖哄煙 -->
<div class="seach-content">
<div class="table-page-search-wrapper">
@@ -33,7 +33,7 @@
</a-row>
<a-row :gutter="24">
- <a-col :md="14" :sm="14" :xs="14">
+ <a-col :md="15" :sm="15" :xs="15">
<a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
@change="efficiencyOptionsOnChange"/>
</a-col>
@@ -49,7 +49,7 @@
</a-row>
</a-form>
</div>
- <div style="width: 400px;top: 20px; right: 0px;">
+ <div style="width: 530px;top: 0; right: 0px;">
<table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">
<tr>
<td v-for="(item, index) in identifying">{{item.title}}</td>
@@ -67,9 +67,9 @@
<table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap">
<thead>
<tr class="thead fixed equipname">
- <th class="thgu dong1 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
- <th class="thgu dong2 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
- <th class="thgu dong3 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
+ <th class="thgu dong1 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;"></th>
+ <th class="thgu dong2 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;"></th>
+ <th class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;"></th>
<th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧缂栧彿</th>
<th class="thgu dong5 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">璁惧鍚嶇О</th>
<th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷</th>
@@ -101,9 +101,9 @@
</thead>
<tbody>
<tr class="mathData" v-for="(item, index) in dataList">
- <td class="tdgu kaitou" :rowspan="item.level1span" :class="{hidden: item.level1dis,noExl:item.level1dis}" v-show="!item.level1dis">{{item.level1}}</td>
- <td class="tdgu1 kaitou" :rowspan="item.level2span" :class="{hidden: item.level2dis,noExl:item.level2dis}" v-show="!item.level2dis">{{item.level2}}</td>
- <td class="tdgu2 kaitou" :rowspan="item.level3span" :class="{hidden: item.level3dis,noExl:item.level3dis}" v-show="!item.level3dis">{{item.level3}}</td>
+ <td class="tdgu kaitou wenzi" :rowspan="item.level1span" :class="{hidden: item.level1dis,noExl:item.level1dis}" v-show="!item.level1dis">{{item.level1}}</td>
+ <td class="tdgu1 kaitou wenzi" :rowspan="item.level2span" :class="{hidden: item.level2dis,noExl:item.level2dis}" v-show="!item.level2dis">{{item.level2}}</td>
+ <td class="tdgu2 kaitou wenzi" :rowspan="item.level3span" :class="{hidden: item.level3dis,noExl:item.level3dis}" v-show="!item.level3dis">{{item.level3}}</td>
<td class="tdgu3 kaitou">{{item.equipmentId}}</td>
<td class="tdgu4 kaitou">{{item.equipmentName}}</td>
<td class="tdgu5 kaitou">{{item.equipmentType}}</td>
@@ -143,7 +143,7 @@
</table>
</div>
</div>
- </a-card>
+ </div>
</div>
</template>
@@ -370,11 +370,11 @@
})
},
initShiftSubList(val) {
- this.queryParam.shiftSubId = null;
+ //姣忔閲嶆柊閫夋嫨鐝埗鏃剁彮娆℃竻绌轰笖鏄剧ずplaceholder鍐呭
+ this.queryParam.shiftSubId = undefined;
getAction(this.url.initShiftSubList, { shiftId: val }).then((res) => {
if (res.success) {
this.shiftSubList = res.result;
-
}
})
},
@@ -406,6 +406,8 @@
dateParamChange(v1, v2) {
this.queryParam.startTime = v2[0]
this.queryParam.endTime = v2[1]
+ // 鐐瑰嚮鏃堕棿閫夋嫨鍣ㄧ殑娓呯┖鎸夐挳鏃朵細瑙﹀彂姝ゅ垽鏂�(鐐瑰嚮閲嶇疆鎸夐挳涓嶄細瑙﹀彂)锛屽疄鐜伴噸缃垪琛ㄥ姛鑳斤紝鍒囧疄鏀瑰彉鍒楄〃鏄剧ず鏁堟灉
+ if(!this.queryParam.startTime&&!this.queryParam.endTime)this.searchReset()
},
efficiencyOptionsOnChange(checkedList) {
let index = checkedList.indexOf('lyl')
@@ -420,14 +422,22 @@
this.checkedList = checkedList
},
searchQuery() {
- if(this.queryParam.typeTree == "1"){
- this.queryParam.parentId = this.queryParamEquip.parentId
- this.queryParam.equipmentId = this.queryParamEquip.equipmentId
+ if(this.dates != ''){
+ if(this.queryParam.typeTree == "1"){
+ this.queryParam.parentId = this.queryParamEquip.parentId
+ this.queryParam.equipmentId = this.queryParamEquip.equipmentId
+ }else{
+ this.queryParam.parentId = this.queryParamPeople.parentId
+ this.queryParam.equipmentId = ""
+ }
+ this.loadData()
}else{
- this.queryParam.parentId = this.queryParamPeople.parentId
- this.queryParam.equipmentId = ""
+ // this.$message.warning("璇烽�夋嫨鏃堕棿")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨鏃堕棿"
+ });
}
- this.loadData()
// this.onClearSelected()
},
searchReset() {
@@ -472,38 +482,45 @@
left: 0;
z-index: 1;
}
+ .table tbody tr .wenzi{
+ /*writing-mode: vertical-lr;*/
+ /*text-orientation: upright;*/
+ transform: rotate(360deg);
+ writing-mode: vertical-lr;
+ letter-spacing: 2px;
+ }
.table tbody tr .kaitou{
z-index: 1;
background-color: white;
}
.table tbody tr .tdgu1{
position: sticky;
- left: 150px;
+ left: 50px;
z-index: 2;
}
.table tbody tr .tdgu2{
position: sticky;
- left: 300px;
+ left: 100px;
z-index: 2;
}
.table tbody tr .tdgu3{
position: sticky;
- left: 450px;
+ left: 150px;
z-index: 2;
}
.table tbody tr .tdgu4{
position: sticky;
- left: 550px;
+ left: 250px;
z-index: 2;
}
.table tbody tr .tdgu5{
position: sticky;
- left: 700px;
+ left: 400px;
z-index: 2;
}
.table tbody tr .tdgu6{
position: sticky;
- left: 800px;
+ left: 500px;
z-index: 2;
}
@@ -528,27 +545,27 @@
}
.table2 thead .equipname .dong2{
z-index: 5;
- left: 150px;
+ left: 50px;
}
.table2 thead .equipname .dong3{
z-index: 5;
- left: 300px;
+ left: 100px;
}
.table2 thead .equipname .dong4{
z-index: 5;
- left: 450px;
+ left: 150px;
}
.table2 thead .equipname .dong5{
z-index: 5;
- left: 550px;
+ left: 250px;
}
.table2 thead .equipname .dong6{
z-index: 5;
- left: 700px;
+ left: 400px;
}
.table2 thead .equipname .dong7{
z-index: 6;
- left: 800px;
+ left: 500px;
}
@media screen and (min-width: 1920px){
@@ -591,7 +608,7 @@
.dataContent {
white-space: nowrap;
/*margin: 0;*/
- border: none;
+ /*border: none;*/
border-collapse: separate;
border-spacing: 0;
/*table-layout: fixed;*/
@@ -619,9 +636,9 @@
width: auto;
}
- .dataContent tr td {
- height: 35px
- }
+ /*.dataContent tr td {*/
+ /*height: 35px*/
+ /*}*/
.dataContent .mathData td {
padding: 10px;
--
Gitblit v1.9.3