From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/DailyMaintenanceOrderList.vue | 136 +++++++++++++++++++++++++++++++--------------
1 files changed, 93 insertions(+), 43 deletions(-)
diff --git a/src/views/eam/DailyMaintenanceOrderList.vue b/src/views/eam/DailyMaintenanceOrderList.vue
index bf01a53..cc5e5e8 100644
--- a/src/views/eam/DailyMaintenanceOrderList.vue
+++ b/src/views/eam/DailyMaintenanceOrderList.vue
@@ -14,6 +14,17 @@
:md="6"
:sm="8"
>
+ <a-form-item label="缁熶竴缂栧彿">
+ <a-input
+ placeholder="璇疯緭鍏ョ粺涓�缂栧彿"
+ v-model="queryParam.equipmentNum"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="8"
+ >
<a-form-item label="淇濆吇宸ュ崟缂栫爜">
<a-input
placeholder="璇疯緭鍏ヤ繚鍏诲伐鍗曠紪鐮�"
@@ -21,37 +32,53 @@
></a-input>
</a-form-item>
</a-col>
- <!-- <a-col
- :md="6"
- :sm="8"
- >
- <a-form-item label="鐐规鏂规硶鍚嶇О">
- <j-input
- placeholder="璇疯緭鍏ョ偣妫�鏂规硶鍚嶇О"
- v-model="queryParam.name"
- ></j-input>
+ <a-col :span="6">
+ <a-form-item label="浣跨敤閮ㄩ棬">
+ <j-dict-select-tag
+ dictCode="sys_depart,depart_name,id"
+ placeholder="璇疯緭鍏ヤ娇鐢ㄩ儴闂�"
+ v-model="queryParam.useDepartId"
+ />
</a-form-item>
- </a-col> -->
- <a-col
- :md="6"
- :sm="8"
- >
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a-button
- type="primary"
- @click="searchQuery"
- icon="search"
- >鏌ヨ</a-button>
- <a-button
- type="primary"
- @click="searchReset"
- icon="reload"
- style="margin-left: 8px"
- >閲嶇疆</a-button>
- </span>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item label="鐘舵��">
+ <j-dict-select-tag
+ dictCode="daily_maintenance_order_status"
+ placeholder="璇烽�夋嫨鐘舵��"
+ v-model="queryParam.status"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="6">
+ <a-form-item label="璐ｄ换鐝粍">
+ <j-dict-select-tag
+ dictCode="mom_base_team,name,id,status='1' and del_flag='0'"
+ placeholder="璇烽�夋嫨璐ｄ换鐝粍"
+ v-model="queryParam.teamId"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item label="绉讳氦鍗曠姸鎬�">
+ <j-dict-select-tag
+ dictCode="two_maintenance_devolution_status"
+ placeholder="璇烽�夋嫨绉讳氦鍗曠姸鎬�"
+ v-model="queryParam.confirmStatus"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="7">
+ <a-form-item label="瀹屽伐鏃堕棿">
+ <a-range-picker
+ style="width: 100%;"
+ format="YYYY-MM-DD HH:mm:ss"
+ v-model="finishTime"
+ @change="timeChange"
+ />
+ </a-form-item>
</a-col>
</a-row>
</a-form>
@@ -67,12 +94,25 @@
v-has="'dailyMaintenanceOrder:add'"
>鏂板</a-button>
<a-button
- v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ style="margin-left: 8px"
+ >鏌ヨ</a-button>
+ <a-button
+ type="primary"
+ @click="searchReset"
+ icon="reload"
+ style="margin-left: 8px"
+ >閲嶇疆</a-button>
+ <a-button
+ v-show="selectedRowKeys.length == 1 && (selectionRows[0].status === '5' || selectionRows[0].status === '8')"
@click="handlePrintInfo(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>绉讳氦鍗曟墦鍗�
</a-button>
+ <!-- v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'" -->
<!-- <a-button
v-show="selectedRowKeys.length > 0"
type="primary"
@@ -297,6 +337,7 @@
import MaintenanceOrderAssignModal from './modules/dailyMaintenanceOrder/MaintenanceOrderAssignModal'
import DailyMaintenanceOrderExeDrawer from './modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer'
import { getAction, postAction, requestPut } from '@/api/manage'
+import moment from 'moment'
export default {
name: 'DailyMaintenanceOrderList',
@@ -311,6 +352,7 @@
return {
description: '浜岀骇淇濆吇宸ュ崟',
queryParam: { maintenanceType: '2' },
+ finishTime: [],
// 琛ㄥご
columns: [
{
@@ -328,6 +370,11 @@
align: "center",
dataIndex: 'num',
scopedSlots: { customRender: 'num' }
+ },
+ {
+ title: '缁熶竴缂栫爜',
+ align: "center",
+ dataIndex: 'equipmentNum',
},
{
title: '鐘舵��',
@@ -356,11 +403,7 @@
align: "center",
dataIndex: 'confirmStatusName'
},
- {
- title: '缁熶竴缂栫爜',
- align: "center",
- dataIndex: 'equipmentNum',
- },
+
{
title: '璁惧鍚嶇О',
align: "center",
@@ -405,13 +448,13 @@
// //width: '120px',
// },
{
- title: '瀹為檯寮�濮嬫椂闂�',
+ title: '鎵ц鏃堕棿',
align: "center",
dataIndex: 'actualStartTime',
//width: '120px',
},
{
- title: '瀹為檯缁撴潫鏃堕棿',
+ title: '瀹屽伐鏃堕棿',
align: "center",
dataIndex: 'actualEndTime',
//width: '120px',
@@ -421,11 +464,11 @@
// align: "center",
// dataIndex: 'actualWorkingHourQuota',
// },
- {
- title: '鎵ц浜�',
- align: "center",
- dataIndex: 'maintenanceUserName'
- },
+ // {
+ // title: '鎶ュ伐浜�',
+ // align: "center",
+ // dataIndex: 'maintenanceUserId'
+ // },
{
title: '闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�',
align: "center",
@@ -599,8 +642,10 @@
},
searchReset() {
+ this.onClearSelected();
this.queryParam = { maintenanceType: '2' }
this.loadData(1);
+ this.finishTime = []
},
// modalFormOk() {
// alert(0)
@@ -610,6 +655,11 @@
// this.onClearSelected()
// },
+ timeChange() {
+ this.queryParam.finishStartTime = moment(this.finishTime[0]).format("YYYY-MM-DD HH:mm:ss")
+ this.queryParam.finishEndTime = moment(this.finishTime[1]).format("YYYY-MM-DD HH:mm:ss")
+ },
+
//棰勮棰滆壊
tableRowClass(record, index) {
if ("1" == record.status || "2" == record.status) {
--
Gitblit v1.9.3