From 24404f195670ab3eb96fa2656113ed403238c5b0 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 三月 2024 09:15:30 +0800
Subject: [PATCH] 设备管理问题项修改
---
src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue | 26 ++
src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue | 10
src/views/eam/DailyInspectionOrderList.vue | 137 ++++++++---
src/views/eam/Daily3MaintenanceOrderList.vue | 135 +++++++----
src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue | 45 ++--
src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue | 79 +++++--
src/views/eam/DailyMaintenanceOrderList.vue | 132 ++++++++---
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue | 8
src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue | 2
src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue | 58 ++--
src/views/eam/modules/equipmentCalibrationOrder/EquipmentList.vue | 8
11 files changed, 422 insertions(+), 218 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index 0ab4543..fe515cf 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>
@@ -55,6 +84,18 @@
icon="plus"
v-has="'daily3MaintenanceOrder:add'"
>鏂板</a-button>
+ <a-button
+ 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 == '8'"
@click="handlePrintPrecision(selectionRows[0])"
@@ -111,19 +152,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"
@@ -442,6 +471,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 +494,7 @@
return {
description: '涓夌骇淇濆吇宸ュ崟',
queryParam: { maintenanceType: '3' },
+ finishTime: [],
// 琛ㄥご
columns: [
{
@@ -483,6 +514,11 @@
scopedSlots: { customRender: 'num' }
},
{
+ title: '缁熶竴缂栫爜',
+ align: "center",
+ dataIndex: 'equipmentNum',
+ },
+ {
title: '鐘舵��',
align: "center",
dataIndex: 'statusName',
@@ -500,11 +536,7 @@
// dataIndex: 'assignModeName',
// width: 100,
// },
- {
- title: '缁熶竴缂栫爜',
- align: "center",
- dataIndex: 'equipmentNum',
- },
+
{
title: '璁惧鍚嶇О',
align: "center",
@@ -547,12 +579,12 @@
// align: "center",
// dataIndex: 'workingHourQuota'
// },
- {
- title: '璁″垝寮�濮嬫椂闂�',
- align: "center",
- dataIndex: 'planStartTime',
- //width: '120px',
- },
+ // {
+ // title: '璁″垝寮�濮嬫椂闂�',
+ // align: "center",
+ // dataIndex: 'planStartTime',
+ // //width: '120px',
+ // },
// {
// title: '璁″垝缁撴潫鏃堕棿',
// align: "center",
@@ -560,13 +592,13 @@
// //width: '120px',
// },
{
- title: '瀹為檯寮�濮嬫椂闂�',
+ title: '鎵ц鏃堕棿',
align: "center",
dataIndex: 'actualStartTime',
//width: '120px',
},
{
- title: '瀹為檯缁撴潫鏃堕棿',
+ title: '瀹屽伐鏃堕棿',
align: "center",
dataIndex: 'actualEndTime',
//width: '120px',
@@ -576,11 +608,11 @@
// align: "center",
// dataIndex: 'actualWorkingHourQuota',
// },
- {
- title: '鎶ュ伐浜�',
- align: "center",
- dataIndex: 'maintenanceUserId'
- },
+ // {
+ // title: '鎶ュ伐浜�',
+ // align: "center",
+ // dataIndex: 'maintenanceUserId'
+ // },
{
title: '闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�',
align: "center",
@@ -809,6 +841,7 @@
searchReset() {
this.queryParam = { maintenanceType: '3' }
this.loadData(1);
+ this.finishTime = []
},
// modalFormOk() {
// alert(0)
@@ -817,6 +850,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) {
diff --git a/src/views/eam/DailyInspectionOrderList.vue b/src/views/eam/DailyInspectionOrderList.vue
index 2beb98a..82c5bae 100644
--- a/src/views/eam/DailyInspectionOrderList.vue
+++ b/src/views/eam/DailyInspectionOrderList.vue
@@ -14,44 +14,74 @@
: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>
- <!-- <a-col
- :md="6"
- :sm="8"
- >
- <a-form-item label="鐐规鏂规硶鍚嶇О">
- <j-input
- placeholder="璇疯緭鍏ョ偣妫�鏂规硶鍚嶇О"
- v-model="queryParam.name"
- ></j-input>
- </a-form-item>
- </a-col> -->
<a-col
:md="6"
:sm="8"
>
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
+ <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="浣跨敤閮ㄩ棬"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
>
- <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>
+ <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="鐘舵��"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ dictCode="daily_inspection_standard_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="璐ｄ换鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <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>
@@ -66,6 +96,18 @@
icon="plus"
v-has="'dailyInspectionOrder:add'"
>鏂板</a-button>
+ <a-button
+ 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
type="primary"
icon="download"
@@ -298,6 +340,7 @@
import InspectionOrderExeModal from './modules/dailyInspectionOrder/InspectionOrderExeModal'
import DailyInspectionOrderExeDrawer from './modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer'
import { getAction, postAction, requestPut } from '@/api/manage'
+import moment from 'moment'
export default {
name: 'DailyInspectionOrderList',
@@ -310,7 +353,8 @@
},
data() {
return {
- description: '鏃ュ父鐐规宸ュ崟',
+ description: '鑷富缁存姢鐐规宸ュ崟',
+ finishTime: [],
// 琛ㄥご
columns: [
{
@@ -329,6 +373,11 @@
align: "center",
dataIndex: 'num',
scopedSlots: { customRender: 'num' }
+ },
+ {
+ title: '缁熶竴缂栫爜',
+ align: "center",
+ dataIndex: 'equipmentNum'
},
{
title: '鐘舵��',
@@ -363,11 +412,7 @@
// align: "center",
// dataIndex: 'inspectionDeadline',
// },
- {
- title: '缁熶竴缂栫爜',
- align: "center",
- dataIndex: 'equipmentNum'
- },
+
{
title: '璁惧鍚嶇О',
align: "center",
@@ -447,11 +492,11 @@
// align: "center",
// dataIndex: 'createBy'
// },
- {
- title: '鍒涘缓鏃ユ湡',
- align: "center",
- dataIndex: 'createTime',
- },
+ // {
+ // title: '鍒涘缓鏃ユ湡',
+ // align: "center",
+ // dataIndex: 'createTime',
+ // },
{
title: '鎿嶄綔',
@@ -595,6 +640,18 @@
})
},
+ searchReset() {
+ this.queryParam = {}
+ this.finishTime = []
+ this.loadData(1);
+ },
+
+ timeChange() {
+ this.queryParam.inspectionStartTime = moment(this.finishTime[0]).format("YYYY-MM-DD HH:mm:ss")
+ this.queryParam.inspectionEndTime = moment(this.finishTime[1]).format("YYYY-MM-DD HH:mm:ss")
+ },
+
+
//棰勮棰滆壊
tableRowClass(record, index) {
if (("1" == record.status || "2" == record.status) && "1鏃�" == record.inspectionCycleName) {
diff --git a/src/views/eam/DailyMaintenanceOrderList.vue b/src/views/eam/DailyMaintenanceOrderList.vue
index 6b87ca7..e4e31a8 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>
@@ -66,6 +93,18 @@
icon="plus"
v-has="'dailyMaintenanceOrder:add'"
>鏂板</a-button>
+ <a-button
+ 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 == '8'"
@click="handlePrintInfo(selectionRows[0])"
@@ -297,6 +336,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 +351,7 @@
return {
description: '浜岀骇淇濆吇宸ュ崟',
queryParam: { maintenanceType: '2' },
+ finishTime: [],
// 琛ㄥご
columns: [
{
@@ -328,6 +369,11 @@
align: "center",
dataIndex: 'num',
scopedSlots: { customRender: 'num' }
+ },
+ {
+ title: '缁熶竴缂栫爜',
+ align: "center",
+ dataIndex: 'equipmentNum',
},
{
title: '鐘舵��',
@@ -356,11 +402,7 @@
align: "center",
dataIndex: 'confirmStatusName'
},
- {
- title: '缁熶竴缂栫爜',
- align: "center",
- dataIndex: 'equipmentNum',
- },
+
{
title: '璁惧鍚嶇О',
align: "center",
@@ -405,13 +447,13 @@
// //width: '120px',
// },
{
- title: '瀹為檯寮�濮嬫椂闂�',
+ title: '鎵ц鏃堕棿',
align: "center",
dataIndex: 'actualStartTime',
//width: '120px',
},
{
- title: '瀹為檯缁撴潫鏃堕棿',
+ title: '瀹屽伐鏃堕棿',
align: "center",
dataIndex: 'actualEndTime',
//width: '120px',
@@ -421,11 +463,11 @@
// align: "center",
// dataIndex: 'actualWorkingHourQuota',
// },
- {
- title: '鎶ュ伐浜�',
- align: "center",
- dataIndex: 'maintenanceUserId'
- },
+ // {
+ // title: '鎶ュ伐浜�',
+ // align: "center",
+ // dataIndex: 'maintenanceUserId'
+ // },
{
title: '闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�',
align: "center",
@@ -601,6 +643,7 @@
searchReset() {
this.queryParam = { maintenanceType: '2' }
this.loadData(1);
+ this.finishTime = []
},
// modalFormOk() {
// alert(0)
@@ -610,6 +653,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) {
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index 5f79a1d..93436bd 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -117,14 +117,14 @@
<a-textarea
allowClear
:disabled="this.model.status!='4'"
- :placeholder="'璇疯緭鍏ラ棶棰樺強澶勭悊鎺柦鎻忚堪'"
+ :placeholder="'璇风淮淇汉鍛樼瀛楀～鍐欙紒'"
v-model="model.description"
/>
</a-form-item>
</a-col>
<a-col :span="7">
<a-form-item
- label="鎶ュ伐浜�"
+ label="淇濆吇浜�"
:labelCol="{span:4}"
:wrapperCol="{span:17}"
class="hightColor"
@@ -132,7 +132,7 @@
<a-input
:disabled="this.model.status!='4'"
allow-clear
- placeholder="璇疯緭鍏ユ姤宸ヤ汉"
+ placeholder="璇疯緭鍏ヤ繚鍏讳汉"
v-model="model.maintenanceUserId"
/>
</a-form-item>
@@ -170,7 +170,7 @@
slot-scope='text, record, index'
>
<div :key="col.dataIndex">
- <span
+ <!-- <span
v-show=" col.dataIndex == 'photo' && !text"
style="font-size: 12px;font-style: italic;"
>鏃犲浘鐗�</span>
@@ -181,7 +181,7 @@
height="25px"
alt=""
style="max-width:80px;font-size: 12px;font-style: italic;"
- />
+ /> -->
<!-- 绀烘剰鍥� 寮�濮� -->
<!-- <Tooltip
placement="top"
@@ -211,8 +211,9 @@
:value="text"
v-show="col.dataIndex == 'maintenanceOrderDetailUda1'"
@change="(e)=>handleChange(e, record.key, col, index)"
- :disabled="record.disabled"
+ :disabled="true"
/>
+ <!-- :disabled="record.disabled" -->
</div>
</template>
</a-table>
@@ -347,7 +348,6 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { requestPut, getAction, downFile, postAction } from '@/api/manage'
import Tooltip from 'ant-design-vue/es/tooltip'
-
import { preview } from 'vue-photo-preview'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import Vue from 'vue'
@@ -474,11 +474,11 @@
// align: 'center',
// dataIndex: 'workingHourQuota',
// },
- {
- title: '淇濆吇鍛ㄦ湡',
- align: 'center',
- dataIndex: 'maintenanceCycleName',
- },
+ // {
+ // title: '淇濆吇鍛ㄦ湡',
+ // align: 'center',
+ // dataIndex: 'maintenanceCycleName',
+ // },
// {
// title: '缁翠繚涓撲笟',
// align: 'center',
@@ -493,7 +493,7 @@
},
],
url: {
- list: "/eam/dailyMaintenanceOrderDetail/getDailyMaintenanceOrderDetailList",
+ list: "/eam/dailyMaintenanceOrderDetail/get3MaintenanceOrderDetailList",
urlDownload: window._CONFIG['staticDomainURL'],
download: '/sys/upload/downloadFile',
editStatus: "/eam/dailyMaintenanceOrder/editStatus",
@@ -564,7 +564,6 @@
return "background-color:rgba(127, 127, 127,0.08)";
},
handleCancel() {
- debugger
this.maintenanceOrderId = '-1'
this.$emit('ok');
this.alterFlag = new Date();
@@ -609,16 +608,16 @@
handleReport() {
const that = this;
that.confirmLoading = true;
- for (let i = 0; i < that.dataSource.length; i++) {
- let o = this.dataSource[i]
- if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
- that.$message.warning("璇峰～鍐欑" + (i + 1) + "淇濆吇浜猴紒");
- that.confirmLoading = false;
- return
- }
- }
+ // for (let i = 0; i < that.dataSource.length; i++) {
+ // let o = this.dataSource[i]
+ // if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
+ // that.$message.warning("璇峰～鍐欑" + (i + 1) + "淇濆吇浜猴紒");
+ // that.confirmLoading = false;
+ // return
+ // }
+ // }
if (that.model.maintenanceUserId == null || that.model.maintenanceUserId == "") {
- that.$message.warning("璇峰～鍐欐姤宸ヤ汉锛�");
+ that.$message.warning("璇峰～鍐欎繚鍏讳汉锛�");
that.confirmLoading = false;
return
}
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
index 976f629..a9d7d6a 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
@@ -83,6 +83,7 @@
auto-size
placeholder="璇疯緭鍏ヤ繚鍏诲唴瀹�"
@change="(e)=>handleChange(e, record.key, col, index)"
+ :disabled="true"
/>
<a-textarea
:value="text"
@@ -91,7 +92,7 @@
auto-size
placeholder="璇疯緭鍏ヤ繚鍏绘爣鍑�"
@change="(e)=>handleChange(e, record.key, col, index)"
- :disabled="false"
+ :disabled="true"
/>
<a-select
v-if="col.dataIndex == 'firstInspect'"
@@ -102,6 +103,12 @@
<a-select-option value="1">閫氳繃</a-select-option>
<a-select-option value="2">鏈�氳繃</a-select-option>
</a-select>
+ <a-input
+ v-if="col.dataIndex == 'firstInspect'"
+ @change="(e)=>handleChange(e, record.key, col, index)"
+ :disabled="false"
+ placeholder="璇峰～鍐欓獙鏀舵湭閫氳繃鍘熷洜"
+ />
<a-select
v-if="col.dataIndex == 'secondInspect'"
:value="text"
@@ -241,6 +248,23 @@
dataIndex: 'standard',
scopedSlots: { customRender: 'standard' }
},
+ // {
+ // title: '楠屾敹娆℃暟',
+ // children: [
+ // {
+ // title: '绗竴娆℃',
+ // dataIndex: 'firstInspect',
+ // align: 'center',
+ // scopedSlots: { customRender: 'firstInspect' }
+ // },
+ // {
+ // title: '绗簩娆℃',
+ // dataIndex: 'secondInspect',
+ // align: 'center',
+ // scopedSlots: { customRender: 'secondInspect' }
+ // },
+ // ],
+ // },
{
title: '绗竴娆℃',
align: 'center',
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
index ede2781..8888f42 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -145,7 +145,7 @@
slot-scope='text, record, index'
>
<div :key="col.dataIndex">
- <span
+ <!-- <span
v-if=" col.dataIndex == 'photo' && !text"
style="font-size: 12px;font-style: italic;"
>鏃犲浘鐗�</span>
@@ -156,7 +156,7 @@
height="25px"
alt=""
style="max-width:80px;font-size: 12px;font-style: italic;"
- />
+ /> -->
<!-- <j-dict-select-tag
v-if="col.dataIndex == 'inspectionProjectResult' "
allow-clear
@@ -206,7 +206,7 @@
:disabled="record.disabled"
/>
- <j-image-upload
+ <!-- <j-image-upload
:value="text"
v-if="col.dataIndex == 'abnormalPhoto'"
:isMultiple="false"
@@ -215,7 +215,7 @@
@change="(e)=>handleChange(e, record.key, col, index)"
:disabled="record.disabled"
>
- </j-image-upload>
+ </j-image-upload> -->
<!-- <Tooltip
placement="top"
diff --git a/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue b/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue
index 8f89e78..5d3d0eb 100644
--- a/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue
@@ -178,7 +178,7 @@
}
requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
if (res.success) {
- that.$message.success(res.message);
+ that.$message.success("椹冲洖鎴愬姛锛�");
that.$emit('ok');
} else {
that.$message.warning(res.message);
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index 5e9f9f4..3c8955e 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -117,14 +117,14 @@
<a-textarea
allowClear
:disabled="this.model.status!='4'"
- :placeholder="'璇疯緭鍏ラ棶棰樺強澶勭悊鎺柦鎻忚堪'"
+ :placeholder="'璇风淮淇汉鍛樼瀛楀～鍐欙紒'"
v-model="model.description"
/>
</a-form-item>
</a-col>
<a-col :span="7">
<a-form-item
- label="鎶ュ伐浜�"
+ label="淇濆吇浜�"
:labelCol="{span:4}"
:wrapperCol="{span:17}"
class="hightColor"
@@ -132,7 +132,7 @@
<a-input
:disabled="this.model.status!='4'"
allow-clear
- placeholder="璇疯緭鍏ユ姤宸ヤ汉"
+ placeholder="璇疯緭鍏ヤ繚鍏讳汉"
v-model="model.maintenanceUserId"
/>
</a-form-item>
@@ -170,7 +170,7 @@
slot-scope='text, record, index'
>
<div :key="col.dataIndex">
- <span
+ <!-- <span
v-if=" col.dataIndex == 'photo' && !text"
style="font-size: 12px;font-style: italic;"
>鏃犲浘鐗�</span>
@@ -181,7 +181,7 @@
height="25px"
alt=""
style="max-width:80px;font-size: 12px;font-style: italic;"
- />
+ /> -->
<!-- 绀烘剰鍥� 寮�濮� -->
<!-- <Tooltip
placement="top"
@@ -212,8 +212,9 @@
v-if="col.dataIndex == 'maintenanceOrderDetailUda1'"
@change="(e)=>handleChange(e, record.key, col, index)"
placeholder="璇疯緭鍏ヤ繚鍏讳汉"
- :disabled="record.disabled"
+ :disabled="true"
/>
+ <!-- :disabled="record.disabled" -->
<!-- <a-input
:value="text"
v-if="col.dataIndex == 'maintenanceOrderDetailUda2'"
@@ -446,6 +447,11 @@
// },
// class: "notshow"
{
+ title: '淇濆吇瑙掕壊',
+ align: 'center',
+ dataIndex: 'maintenanceRole',
+ },
+ {
title: '淇濆吇鍐呭',
align: 'center',
dataIndex: 'maintenanceProjectNum',
@@ -475,11 +481,11 @@
// align: 'center',
// dataIndex: 'workingHourQuota',
// },
- {
- title: '淇濆吇鍛ㄦ湡',
- align: 'center',
- dataIndex: 'maintenanceCycleName',
- },
+ // {
+ // title: '淇濆吇鍛ㄦ湡',
+ // align: 'center',
+ // dataIndex: 'maintenanceCycleName',
+ // },
// {
// title: '缁翠繚涓撲笟',
// align: 'center',
@@ -621,14 +627,14 @@
that.confirmLoading = false;
return
}
- if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
- that.$message.warning("璇峰～鍐欑" + (i + 1) + "淇濆吇浜猴紒");
- that.confirmLoading = false;
- return
- }
+ // if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
+ // that.$message.warning("璇峰～鍐欑" + (i + 1) + "淇濆吇浜猴紒");
+ // that.confirmLoading = false;
+ // return
+ // }
}
if (that.model.maintenanceUserId == null || that.model.maintenanceUserId == "") {
- that.$message.warning("璇峰～鍐欐姤宸ヤ汉锛�");
+ that.$message.warning("璇峰～鍐欎繚鍏讳汉锛�");
that.confirmLoading = false;
return
}
@@ -697,11 +703,11 @@
that.loading = false;
return
}
- if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
- that.$message.warning("璇峰～鍐欑" + (i + 1) + "淇濆吇浜猴紒");
- that.loading = false;
- return
- }
+ // if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
+ // that.$message.warning("璇峰～鍐欑" + (i + 1) + "淇濆吇浜猴紒");
+ // that.loading = false;
+ // return
+ // }
}
this.form.validateFields((err, values) => {
if (!err) {
@@ -711,7 +717,7 @@
let obj = obj = postAction(this.url.edit, formData)
obj.then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ that.$message.success("淇濆瓨鎴愬姛锛�")
that.$emit('ok')
} else {
that.$message.warning(res.message)
@@ -732,9 +738,9 @@
const target = temp[index];
if (target) {
target[column.dataIndex] = value;
- if ('maintenanceOrderDetailUda1' == column.dataIndex) {
- target['maintenanceOrderDetailUda1'] = value.target.value;
- }
+ // if ('maintenanceOrderDetailUda1' == column.dataIndex) {
+ // target['maintenanceOrderDetailUda1'] = value.target.value;
+ // }
if ('maintenanceOrderDetailUda2' == column.dataIndex) {
target['maintenanceOrderDetailUda2'] = value.target.value;
}
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
index daf2aa3..7ba8ef5 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
@@ -64,13 +64,25 @@
</a-form-item>
</a-col>
<a-col :span="8">
- <a-form-item
+ <!-- <a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="淇濆吇鏃ユ湡"
>
<span v-if="this.model != null">{{ this.model.actualEndTime }}</span>
<span v-else>-</span>
+ </a-form-item> -->
+ <a-form-item
+ label="淇濆吇鏃ユ湡"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-date
+ v-model="model.maintenanceDate"
+ placeholder="璇烽�夋嫨淇濆吇鏃ユ湡"
+ :showTime="true"
+ dateFormat="YYYY-MM-DD"
+ />
</a-form-item>
</a-col>
</a-row>
@@ -84,9 +96,17 @@
:columns="columns"
:dataSource="dataSource"
:pagination="false"
- >
+ />
+ <a-table
+ ref="table"
+ bordered
+ size="middle"
+ rowKey='id'
+ :columns="columns"
+ :dataSource="dataSourceOperation"
+ :pagination="false"
+ />
- </a-table>
<div :style="{width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
<div class="ant-descriptions-title">闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩帮細</div>
<a-textarea
@@ -210,8 +230,15 @@
data() {
return {
columns: [
+
{
- title: '#',
+ title: '绫诲瀷',
+ align: 'center',
+ width: 260,
+ dataIndex: 'maintenanceRole'
+ },
+ {
+ title: '搴忓彿',
dataIndex: '',
key: 'rowIndex',
align: 'center',
@@ -220,11 +247,6 @@
},
width: 50,
},
- {
- title: '绫诲瀷',
- align: 'center',
- dataIndex: 'maintenanceRole'
- },
// {
// title: '閮ㄤ綅',
@@ -232,7 +254,7 @@
// dataIndex: 'location'
// },
{
- title: '淇濆吇椤圭洰',
+ title: '淇濆吇鍐呭',
align: 'center',
dataIndex: 'maintenanceProjectName'
},
@@ -244,12 +266,14 @@
{
title: '鎵ц鎯呭喌',
align: 'center',
- dataIndex: 'maintenanceOrderDetailUda2'
+ dataIndex: 'maintenanceOrderDetailUda2',
+ width: 150,
},
{
title: '鎵ц浜�',
align: 'center',
dataIndex: 'maintenanceOrderDetailUda1',
+ width: 150,
},
],
@@ -258,6 +282,7 @@
disableSubmit: false,
codeDisable: true,
dataSource: [],
+ dataSourceOperation: [],
model: {},
// departs: [],
labelCol: {
@@ -297,18 +322,26 @@
this.form.resetFields();
this.model = Object.assign({}, record);
this.visible = true;
- if (record.dailyMaintenanceDetails != undefined) {
- const temp = [...record.dailyMaintenanceDetails];
+ // if (record.dailyMaintenanceDetails != undefined) {
+ // const temp = [...record.dailyMaintenanceDetails];
+ // that.dataSource = temp;
+ // }
+ if (record.operationUserDetails != undefined) {
+ const temp = [...record.operationUserDetails];
+ that.dataSourceOperation = temp;
+ }
+ if (record.repairUserDetails != undefined) {
+ const temp = [...record.repairUserDetails];
that.dataSource = temp;
}
- that.$nextTick(() => {
- that.form.setFieldsValue(pick(that.model, 'num', 'teamId', 'remark'));
- });
- if (record.id) {
- this.codeDisable = true;
- } else {
- this.codeDisable = false;
- }
+ // that.$nextTick(() => {
+ // that.form.setFieldsValue(pick(that.model, 'num', 'teamId', 'remark'));
+ // });
+ // if (record.id) {
+ // this.codeDisable = true;
+ // } else {
+ // this.codeDisable = false;
+ // }
},
@@ -339,7 +372,7 @@
} else if (this.model.confirmStatus == '4') {
formData.confirmStatus = '2'
}
- requestPut(this.url.edit, formData, { id: this.model.id }).then((res) => {
+ requestPut(this.url.edit, formData, { id: this.model.id, maintenanceDate: this.model.maintenanceDate }).then((res) => {
if (res.success) {
that.$message.success(res.message);
that.$emit('ok');
@@ -376,7 +409,7 @@
} else if (this.model.confirmStatus == '5') {
formData.confirmStatus = '7'
}
- requestPut(this.url.edit, formData, { id: this.model.id }).then((res) => {
+ requestPut(this.url.edit, formData, { id: this.model.id, maintenanceDate: this.model.maintenanceDate }).then((res) => {
if (res.success) {
that.$message.success(res.message);
that.$emit('ok');
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
index a20afa7..d0b40eb 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
@@ -179,11 +179,11 @@
// align: "center",
// dataIndex: 'workingHourQuota',
// },
- {
- title: '淇濆吇鍛ㄦ湡',
- align: "center",
- dataIndex: 'maintenanceCycleName',
- },
+ // {
+ // title: '淇濆吇鍛ㄦ湡',
+ // align: "center",
+ // dataIndex: 'maintenanceCycleName',
+ // },
// {
// title: '缁翠繚涓撲笟',
// align: "center",
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentList.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentList.vue
index 494e2f2..b3e7098 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentList.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentList.vue
@@ -22,10 +22,10 @@
:sm="8"
>
<a-form-item label="璁惧缂栧彿">
- <j-input
+ <a-input
placeholder="璇疯緭鍏ユ爣鍑嗙紪鍙锋绱�"
v-model="queryParam.num"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
@@ -34,10 +34,10 @@
:sm="8"
>
<a-form-item label="璁惧鍚嶇О">
- <j-input
+ <a-input
placeholder="璇疯緭鍏ヨ澶囧悕绉版绱�"
v-model="queryParam.name"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
<a-col
--
Gitblit v1.9.3