From a751e547d67c4f8e2c6fddf958c1559f792515bd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 16:11:50 +0800
Subject: [PATCH] 添加工作流
---
src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue | 144 +++++++++++++++++++++++++++++------------------
1 files changed, 88 insertions(+), 56 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
index 1a46371..585b0f6 100644
--- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
+++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
@@ -39,21 +39,23 @@
</a-col>
<a-col :md="6" :sm="6">
<a-form-item label="鏃堕棿">
- <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates"
+ <a-range-picker @change="dateParamChange" :disabledDate="disabledDate"
+ @calendarChange="handleCalendarChange" @openChange="handleCalendarOpenChange"
+ format="YYYYMMDD" v-model="dates"
:allowClear="false"/>
</a-form-item>
</a-col>
<a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧绉嶇被">
+ <a-form-item label="璁惧绾у埆">
<a-select
- :value="queryParams.deviceCategory"
+ :value="queryParams.deviceLevel"
mode="multiple"
- placeholder="璇烽�夋嫨璁惧绉嶇被"
+ placeholder="璇烽�夋嫨璁惧绾у埆"
allow-clear
:maxTagCount="1"
- @change="selectChange($event,'deviceCategory')"
+ @change="selectChange($event,'deviceLevel')"
>
- <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
+ <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
{{item.label}}
</a-select-option>
</a-select>
@@ -72,31 +74,13 @@
</a-row>
<a-row :gutter="24" v-if="toggleSearchStatus">
- <a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧绾у埆">
- <a-select
- :value="queryParams.deviceLevel"
- mode="multiple"
- placeholder="璇烽�夋嫨璁惧绾у埆"
- allow-clear
- :maxTagCount="1"
- @change="selectChange($event,'deviceLevel')"
- >
- <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
- {{item.label}}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
+
<a-col :md="5" :sm="5" :xs="5">
<a-form-item label="閲嶈绋嬪害">
<a-select
- :value="queryParams.deviceImportanceLevel"
- mode="multiple"
+ v-model="queryParam.deviceImportanceLevel"
placeholder="璇烽�夋嫨璁惧閲嶈绋嬪害"
allow-clear
- :maxTagCount="1"
- @change="selectChange($event,'deviceImportanceLevel')"
>
<a-select-option v-for="(item,index) in device_importance_level_list" :value="item.value"
:key="index">
@@ -115,12 +99,14 @@
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
<a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
+ <a-button type="primary" @click="handleShowFeedbackModal" icon="plus" v-has="'EfficiencyPO:feedback'">
+ 寮傚父鍙嶉
+ </a-button>
<a-button type="primary" icon="printer" v-print="'#EfficiencyPO'"
v-has="'EfficiencyPO:print'">鎵撳嵃
</a-button>
</a-space>
- <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
- @change="efficiencyOptionsOnChange"/>
+
</div>
<table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">
<tr>
@@ -132,6 +118,13 @@
</td>
</tr>
</table>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col>
+ <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
+ @change="efficiencyOptionsOnChange"/>
</a-col>
</a-row>
</a-form>
@@ -154,6 +147,8 @@
<th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">璁惧鍚嶇О
</th>
<th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷
+ </th>
+ <th class="thgu dong7 name" rowspan="2" style="min-width: 120px; max-width: 120px;width: 120px;">璁惧鍨嬪彿
</th>
<!--<th rowspan="2">缁勫埆</th>-->
<template v-for="(tableHead, index) in tableHeads">
@@ -197,10 +192,11 @@
{{item.equipmentName}}
</td>
<td class="tdgu5 kaitou">{{item.equipmentType}}</td>
+ <td class="tdgu6 kaitou">{{item.equipmentModel}}</td>
</template>
<template v-else>
- <td colspan="6" class="tdgu kaitou">{{item.level1}}</td>
+ <td colspan="7" class="tdgu kaitou">{{item.level1}}</td>
</template>
<template v-for="(tableHead, index) in item.dataList">
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('lyl') > -1">
@@ -229,6 +225,8 @@
</div>
</a-spin>
</div>
+
+ <mdc-message-approval-modal ref="modalForm" :visible="modalVisible" @closeModal="modalVisible = false"/>
</div>
</template>
@@ -239,10 +237,11 @@
import '@/components/table2excel/table2excel'
import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
import api from '@/api/mdc'
+ import MdcMessageApprovalModal from '../MdcMessageApproval/MdcMessageApprovalModal'
export default {
name: 'EfficiencyPOList',
- components: {},
+ components: { MdcMessageApprovalModal },
data() {
return {
typeTree: '',
@@ -252,14 +251,12 @@
equipmentTypeList: [],
driveTypeList: [],
device_level_list: [],
- device_category_list: [],
+ device_importance_level_list: [],
queryParam: {},
queryParams: {
equipmentType: [],
driveType: [],
- deviceLevel: [],
- deviceCategory: [],
- deviceImportanceLevel: []
+ deviceLevel: []
},
queryParamEquip: {},
queryParamPeople: {},
@@ -281,7 +278,9 @@
},
tableHeads: [],
spinning: false,
- toggleSearchStatus: false
+ toggleSearchStatus: false,
+ modalVisible: false,// 寮傚父鍙嶉寮圭獥鏄惁寮瑰嚭
+ preSelectFirstDate: null
}
},
props: { nodeTree: '', Type: '', nodePeople: '' },
@@ -437,7 +436,6 @@
},
// 鍚堝苟
combineCell() {
- console.log(this.dataList)
let list = this.dataList
for (let field in list[0]) {
var k = 0
@@ -459,10 +457,37 @@
}
return list
},
- disabledDate(current) {
- //Can not slect days before today and today
- return current && current > moment().subtract('days', 1)
+
+ /**
+ * 鏃堕棿閫夋嫨鍣ㄩ潰鏉夸笂鐨勫�煎彂鐢熸敼鍙樻椂瑙﹀彂
+ * @param dates 闈㈡澘涓婄殑涓や釜鍊肩粍鎴愮殑鏁扮粍
+ */
+ handleCalendarChange(dates) {
+ if (dates.length === 1) this.preSelectFirstDate = dates[0]
},
+
+ /**
+ * 鎺у埗鏃堕棿閫夋嫨鍣ㄩ潰鏉垮紑鍚笌鍏抽棴
+ * @param status 寮�鍚姸鎬�
+ */
+ handleCalendarOpenChange(status) {
+ if (status) this.preSelectFirstDate = null
+ },
+
+ /**
+ * 闈㈡澘涓婄姝㈤�夋嫨鐨勬棩鏈�
+ * @param current 绂佹鐨勬椂闂磋寖鍥�
+ */
+ disabledDate(current) {
+ if (!this.preSelectFirstDate) {
+ return current > moment().startOf('days')
+ } else {
+ return current < moment(this.preSelectFirstDate).subtract(365, 'days').startOf('days')
+ || current > moment().startOf('days')
+ || current > moment(this.preSelectFirstDate).add(365, 'days').endOf('days')
+ }
+ },
+
initDeviceType(deviceList) {
let dictCode = 'mdc_equipmentType'
let items = []
@@ -511,19 +536,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')
- // if (index < 0) {
- // // this.$message.warn('涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�')
- // this.$notification.warning({
- // message:'娑堟伅',
- // description:"涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�"
- // })
- // return false
- // }
this.checkedList = checkedList
},
searchQuery() {
@@ -535,9 +549,11 @@
this.queryParam.equipmentId = ''
}
Object.keys(this.queryParams).forEach(item => {
- this.queryParam[item] = this.queryParams[item].join()
- // 姝ゅ涓轰繚璇佹帴鍙ｅ弬鏁颁笉澶氫綑锛屽彲鐪佺暐
- if (this.queryParams[item].length === 0) delete this.queryParam[item]
+ if (Array.isArray(this.queryParams[item])) {
+ this.queryParam[item] = this.queryParams[item].join()
+ // 姝ゅ涓轰繚璇佹帴鍙ｅ弬鏁颁笉澶氫綑锛屽彲鐪佺暐
+ if (this.queryParams[item].length === 0) delete this.queryParam[item]
+ }
})
this.loadData()
},
@@ -556,8 +572,7 @@
this.queryParams = {
equipmentType: [],
driveType: [],
- deviceLevel: [],
- deviceCategory: []
+ deviceLevel: []
}
this.loadData()
},
@@ -567,7 +582,6 @@
this.dataList = []
getAction(this.url.list, this.queryParam).then(res => {
if (res.success) {
- // console.log(res.result)
this.tableHeads = res.result.dates
this.dataList = res.result.mdcEfficiencyList
if (res.result.mdcEfficiencyList && !res.result.mdcEfficiencyList.length) {
@@ -586,6 +600,13 @@
this.spinning = false
})
},
+
+ // 鎺у埗寮傚父鍙嶉寮圭獥寮瑰嚭
+ handleShowFeedbackModal() {
+ this.$refs.modalForm.formParams = {}
+ this.modalVisible = true
+ },
+
queryGroup() {
getAction(this.url.queryEquipmentType).then(res => {
if (res.success) {
@@ -686,6 +707,12 @@
z-index: 2;
}
+ .table tbody tr .tdgu6 {
+ position: sticky;
+ left: 512px;
+ z-index: 2;
+ }
+
.table2 thead tr .timeth,
.table2 thead tr .thgu {
position: sticky;
@@ -733,6 +760,11 @@
left: 412px;
}
+ .table2 thead .equipname .dong7 {
+ z-index: 5;
+ left: 512px;
+ }
+
#EfficiencyPO {
overflow: hidden;
}
--
Gitblit v1.9.3