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/Daily3MaintenanceOrderList.vue | 160 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 111 insertions(+), 49 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index 58808ee..a93be15 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -14,10 +14,10 @@
:md="6"
:sm="8"
>
- <a-form-item label="涓夌骇宸ュ崟缂栫爜">
+ <a-form-item label="缁熶竴缂栧彿">
<a-input
- placeholder="璇疯緭鍏ヤ笁绾у伐鍗曠紪鐮�"
- v-model="queryParam.num"
+ placeholder="璇疯緭鍏ョ粺涓�缂栧彿"
+ v-model="queryParam.equipmentNum"
></a-input>
</a-form-item>
</a-col>
@@ -25,22 +25,51 @@
: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-form-item label="淇濆吇宸ュ崟缂栫爜">
+ <a-input
+ placeholder="璇疯緭鍏ヤ繚鍏诲伐鍗曠紪鐮�"
+ v-model="queryParam.num"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <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 :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="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>
@@ -56,25 +85,52 @@
v-has="'daily3MaintenanceOrder: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].isNotStoveCategoryFlag == false && selectionRows[0].precisionParameters == '1' "
@click="handlePrintPrecision(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>绮惧害妫�楠屽崟鎵撳嵃
</a-button>
<a-button
- v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status === '5'"
@click="handlePrintCheck(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 == 1 && selectionRows[0].status == '8'"
@click="handlePrintInfo(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>绉讳氦鍗曟墦鍗�
+ </a-button>
+ <a-button
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '5' && selectionRows[0].isNotStoveCategoryFlag == false && selectionRows[0].precisionParameters != '1'"
+ @click="handlePrintTechnology(selectionRows[0])"
+ type="primary"
+ style="margin-left: 8px"
+ >鎶�鏈姸鎬侀壌瀹氭墦鍗�
+ </a-button>
+ <a-button
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '5' && selectionRows[0].isNotStoveCategoryFlag == true"
+ @click="handlePrintStove(selectionRows[0])"
+ type="primary"
+ style="margin-left: 8px"
+ >鐐夌被妫�娴嬫墦鍗�
</a-button>
<!-- <a-button
v-if="selectedRowKeys.length > 0"
@@ -111,19 +167,7 @@
</a-dropdown> -->
</div>
- <!-- table鍖哄煙-begin -->
<div>
- <!-- <div
- class="ant-alert ant-alert-info"
- style="margin-bottom: 16px;"
- >
- <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
- <a
- style="margin-left: 24px"
- @click="onClearSelected"
- >娓呯┖</a>
- </div> -->
-
<a-table
ref="table"
size="middle"
@@ -297,22 +341,22 @@
type="vertical"
/>
<a
- v-show="record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == true "
@click="handleStoveDetection(record)"
v-has="'daily3MaintenanceOrder:StoveCategory'"
>鐐夌被妫�娴�</a>
<!-- v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" -->
<a-divider
- v-show=" record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show=" record.status === '5' && record.isNotStoveCategoryFlag == true "
type="vertical"
/>
<a
- v-show=" record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show=" record.status === '5' && record.isNotStoveCategoryFlag == true "
@click="handleStoveReport(record)"
v-has="'daily3MaintenanceOrder:StoveCategoryReport'"
>鐐夌被鎶ュ憡</a>
<a-divider
- v-show="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == true "
type="vertical"
/>
<a
@@ -442,6 +486,7 @@
import Maintenance3ReceiptModal from './modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue'
import { getAction, postAction, requestPut } from '@/api/manage'
import JEllipsis from "@/components/jeecg/JEllipsis";
+import moment from 'moment'
export default {
name: 'DailyMaintenanceOrderList',
@@ -464,6 +509,7 @@
return {
description: '涓夌骇淇濆吇宸ュ崟',
queryParam: { maintenanceType: '3' },
+ finishTime: [],
// 琛ㄥご
columns: [
{
@@ -483,6 +529,11 @@
scopedSlots: { customRender: 'num' }
},
{
+ title: '缁熶竴缂栫爜',
+ align: "center",
+ dataIndex: 'equipmentNum',
+ },
+ {
title: '鐘舵��',
align: "center",
dataIndex: 'statusName',
@@ -500,11 +551,7 @@
// dataIndex: 'assignModeName',
// width: 100,
// },
- {
- title: '缁熶竴缂栫爜',
- align: "center",
- dataIndex: 'equipmentNum',
- },
+
{
title: '璁惧鍚嶇О',
align: "center",
@@ -560,13 +607,13 @@
// //width: '120px',
// },
{
- title: '瀹為檯寮�濮嬫椂闂�',
+ title: '鎵ц鏃堕棿',
align: "center",
dataIndex: 'actualStartTime',
//width: '120px',
},
{
- title: '瀹為檯缁撴潫鏃堕棿',
+ title: '瀹屽伐鏃堕棿',
align: "center",
dataIndex: 'actualEndTime',
//width: '120px',
@@ -576,11 +623,11 @@
// align: "center",
// dataIndex: 'actualWorkingHourQuota',
// },
- {
- title: '鎵ц浜�',
- align: "center",
- dataIndex: 'maintenanceUserName'
- },
+ // {
+ // title: '鎶ュ伐浜�',
+ // align: "center",
+ // dataIndex: 'maintenanceUserId'
+ // },
{
title: '闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�',
align: "center",
@@ -668,6 +715,15 @@
window.open(href, "_blank");
},
+ handlePrintTechnology(record) {
+ let href = `${window._CONFIG['domianURL']}/jmreport/view/932475014657814528?id=` + record.id; //缃戠珯閾炬帴
+ window.open(href, "_blank");
+ },
+
+ handlePrintStove(record) {
+ let href = `${window._CONFIG['domianURL']}/jmreport/view/932491838782910464?id=` + record.id; //缃戠珯閾炬帴
+ window.open(href, "_blank");
+ },
handleOrderExe(record) {
this.$refs.DailyMaintenanceOrderExeDrawer.visible = true
@@ -807,8 +863,10 @@
},
searchReset() {
+ this.onClearSelected();
this.queryParam = { maintenanceType: '3' }
this.loadData(1);
+ this.finishTime = []
},
// modalFormOk() {
// alert(0)
@@ -817,6 +875,10 @@
// //娓呯┖鍒楄〃閫変腑
// 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) {
--
Gitblit v1.9.3