From 9d3b355061393f9dd031c1d8aaf124564d9c0d19 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 24 十月 2023 17:06:17 +0800
Subject: [PATCH] 编码生成
---
src/views/eam/SpecialtyMaintenanceStandardList.vue | 50 +-
src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardModal.vue | 92 ++-
src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue | 44 +
src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue | 54 -
src/views/eam/modules/dailyInspectionStandard/EquipmentList.vue | 6
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue | 11
src/views/eam/modules/specialtyMaintenancePlan/JSelectSpecialtyMaintenanceStandardModal.vue | 2
src/views/eam/SpecialtyMaintenanceOrderList.vue | 25
src/views/eam/modules/specialtyMaintenanceOrder/MaintenanceOrderModal.vue | 16
src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue | 18
src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue | 30
src/views/eam/modules/maintenancePlan/StandardSelect.vue | 27
src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardDetail.vue | 57 +
src/views/eam/modules/specialtyMaintenanceStandard/JSelectMaintenanceStandardModal.vue | 30
src/views/eam/modules/specialtyMaintenanceStandard/EquipmentList.vue | 24
src/views/eam/DailyMaintenanceOrderList.vue | 8
src/views/eam/DailyInspectionOrderList.vue | 21
src/views/eam/DailyInspectionStandardList.vue | 33
src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue | 18
src/views/eam/SpecialtyMaintenancePlanList.vue | 2
src/views/eam/DailyMaintenanceStandardList.vue | 32
src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue | 26
src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue | 41 +
src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue | 30
src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue | 505 +++++++++++----------
src/views/eam/Daily3MaintenanceOrderList.vue | 8
src/views/eam/modules/inspectionProject/InspectionProjectModel.vue | 81 +-
src/views/eam/modules/inspectionProject/InspectionProjectRight.vue | 47 +-
src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceStandardList.vue | 4
29 files changed, 732 insertions(+), 610 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index 2c7e916..b50a6ac 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -1,7 +1,7 @@
<template>
<a-card
:bordered="false"
- title="涓夌骇淇濆吇宸ュ崟"
+ title="涓夌骇淇濆吇"
>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -145,11 +145,11 @@
slot-scope="text, record"
>
<a-popconfirm
- title="纭畾涓嬪彂宸ュ崟鍚�?"
+ title="纭畾鎺ユ敹宸ュ崟鍚�?"
@confirm="() => handleOrderIssue(record)"
v-has="'dailyMaintenanceOrder:issue'"
>
- <a v-if="record.status == '1'">涓嬪彂</a>
+ <a v-if="record.status == '1'">鎺ユ敹</a>
</a-popconfirm>
<a-divider
v-if="record.status == '1'"
@@ -424,7 +424,7 @@
dataIndex: 'assignModeName'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'equipmentNum',
},
diff --git a/src/views/eam/DailyInspectionOrderList.vue b/src/views/eam/DailyInspectionOrderList.vue
index c9ffbdc..7d1fc8d 100644
--- a/src/views/eam/DailyInspectionOrderList.vue
+++ b/src/views/eam/DailyInspectionOrderList.vue
@@ -1,7 +1,7 @@
<template>
<a-card
:bordered="false"
- title="鏃ヤ繚鍛ㄤ繚宸ュ崟"
+ title="鑷富缁存姢鐐规宸ュ崟"
>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -129,11 +129,11 @@
slot-scope="text, record"
>
<a-popconfirm
- title="纭畾涓嬪彂宸ュ崟鍚�?"
+ title="纭畾鎺ユ敹宸ュ崟鍚�?"
@confirm="() => handleOrderIssue(record)"
v-has="'dailyInspectionOrder:issue'"
>
- <a v-if="record.status == '1'">涓嬪彂</a>
+ <a v-if="record.status == '1'">鎺ユ敹</a>
</a-popconfirm>
<a-divider
v-if="record.status == '1'"
@@ -311,16 +311,17 @@
return parseInt(index) + 1;
}
},
- {
- title: '鐘舵��',
- align: "center",
- dataIndex: 'statusName'
- },
+
{
title: '鐐规宸ュ崟鍙�',
align: "center",
dataIndex: 'num',
scopedSlots: { customRender: 'num' }
+ },
+ {
+ title: '鐘舵��',
+ align: "center",
+ dataIndex: 'statusName'
},
{
title: '鐐规鏃ユ湡',
@@ -344,7 +345,7 @@
dataIndex: 'inspectionDeadline',
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'equipmentNum'
},
@@ -359,7 +360,7 @@
dataIndex: 'equipmentModel'
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: "center",
dataIndex: 'useDepartName'
},
diff --git a/src/views/eam/DailyInspectionStandardList.vue b/src/views/eam/DailyInspectionStandardList.vue
index 0cb2c33..dcd9b00 100644
--- a/src/views/eam/DailyInspectionStandardList.vue
+++ b/src/views/eam/DailyInspectionStandardList.vue
@@ -1,6 +1,6 @@
<template>
<a-card
- title="鏃ヤ繚鍛ㄤ繚鏍囧噯"
+ title="鑷富缁存姢鐐规鏍囧噯"
:bordered='false'
>
<div class='table-page-search-wrapper'>
@@ -216,23 +216,14 @@
return parseInt(index) + 1
}
},
- {
- title: '鐗堟湰',
- align: 'center',
- dataIndex: 'version',
- },
- {
- title: '鐗堟湰鐘舵��',
- align: 'center',
- dataIndex: 'versionStatusName',
- },
+
{
title: '鏍囧噯缂栫爜',
align: 'center',
dataIndex: 'num',
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: 'center',
dataIndex: 'useDepartName',
},
@@ -261,15 +252,25 @@
align: 'center',
dataIndex: 'assignModeName',
},
+ // {
+ // title: '鐢熸晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'takeEffectTime',
+ // },
+ // {
+ // title: '澶辨晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'loseEfficacyTime',
+ // },
{
- title: '鐢熸晥鏃堕棿',
+ title: '鐗堟湰',
align: 'center',
- dataIndex: 'takeEffectTime',
+ dataIndex: 'version',
},
{
- title: '澶辨晥鏃堕棿',
+ title: '鐗堟湰鐘舵��',
align: 'center',
- dataIndex: 'loseEfficacyTime',
+ dataIndex: 'versionStatusName',
},
{
title: '鍒涘缓浜�',
diff --git a/src/views/eam/DailyMaintenanceOrderList.vue b/src/views/eam/DailyMaintenanceOrderList.vue
index ee8e9e5..d9790a7 100644
--- a/src/views/eam/DailyMaintenanceOrderList.vue
+++ b/src/views/eam/DailyMaintenanceOrderList.vue
@@ -1,7 +1,7 @@
<template>
<a-card
:bordered="false"
- title="浜岀骇淇濆吇宸ュ崟"
+ title="浜岀骇淇濆吇"
>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -142,11 +142,11 @@
slot-scope="text, record"
>
<a-popconfirm
- title="纭畾涓嬪彂宸ュ崟鍚�?"
+ title="纭畾鎺ユ敹宸ュ崟鍚�?"
@confirm="() => handleOrderIssue(record)"
v-has="'dailyMaintenanceOrder:issue'"
>
- <a v-if="record.status == '1'">涓嬪彂</a>
+ <a v-if="record.status == '1'">鎺ユ敹</a>
</a-popconfirm>
<a-divider
v-if="record.status == '1'"
@@ -356,7 +356,7 @@
dataIndex: 'assignModeName'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'equipmentNum',
},
diff --git a/src/views/eam/DailyMaintenanceStandardList.vue b/src/views/eam/DailyMaintenanceStandardList.vue
index 30e82f1..6a743f4 100644
--- a/src/views/eam/DailyMaintenanceStandardList.vue
+++ b/src/views/eam/DailyMaintenanceStandardList.vue
@@ -281,23 +281,13 @@
}
},
{
- title: '鐗堟湰',
- align: 'center',
- dataIndex: 'version',
- },
- {
- title: '鐗堟湰鐘舵��',
- align: 'center',
- dataIndex: 'versionStatusName',
- },
- {
title: '鏍囧噯缂栫爜',
align: 'center',
dataIndex: 'num',
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum',
},
@@ -312,7 +302,7 @@
dataIndex: 'equipmentModel',
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: 'center',
dataIndex: 'useDepartName',
},
@@ -331,15 +321,25 @@
align: 'center',
dataIndex: 'specificEquipment',
},
+ // {
+ // title: '鐢熸晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'takeEffectTime',
+ // },
+ // {
+ // title: '澶辨晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'loseEfficacyTime',
+ // },
{
- title: '鐢熸晥鏃堕棿',
+ title: '鐗堟湰',
align: 'center',
- dataIndex: 'takeEffectTime',
+ dataIndex: 'version',
},
{
- title: '澶辨晥鏃堕棿',
+ title: '鐗堟湰鐘舵��',
align: 'center',
- dataIndex: 'loseEfficacyTime',
+ dataIndex: 'versionStatusName',
},
{
title: '鍒涘缓浜�',
diff --git a/src/views/eam/SpecialtyMaintenanceOrderList.vue b/src/views/eam/SpecialtyMaintenanceOrderList.vue
index c557e19..acafc95 100644
--- a/src/views/eam/SpecialtyMaintenanceOrderList.vue
+++ b/src/views/eam/SpecialtyMaintenanceOrderList.vue
@@ -1,7 +1,7 @@
<template>
<a-card
:bordered="false"
- title="涓撲笟淇濆吇宸ュ崟"
+ title="棰勯槻鎬т繚鍏诲伐鍗�"
>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -328,16 +328,7 @@
return parseInt(index) + 1;
}
},
- {
- title: '鐘舵��',
- align: "center",
- dataIndex: 'statusName'
- },
- {
- title: '缁翠繚鏂瑰紡',
- align: "center",
- dataIndex: 'maintenanceMode'
- },
+
{
title: '淇濆吇宸ュ崟鍙�',
align: "center",
@@ -345,7 +336,7 @@
scopedSlots: { customRender: 'num' }
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: "center",
dataIndex: 'departName',
},
@@ -374,6 +365,16 @@
align: "center",
dataIndex: 'teamName',
},
+ {
+ title: '鐘舵��',
+ align: "center",
+ dataIndex: 'statusName'
+ },
+ {
+ title: '缁翠繚鏂瑰紡',
+ align: "center",
+ dataIndex: 'maintenanceMode'
+ },
// {
// title: '宸ユ椂瀹氶/姣忓皬鏃�',
// align: "center",
diff --git a/src/views/eam/SpecialtyMaintenancePlanList.vue b/src/views/eam/SpecialtyMaintenancePlanList.vue
index fe13c40..16bc709 100644
--- a/src/views/eam/SpecialtyMaintenancePlanList.vue
+++ b/src/views/eam/SpecialtyMaintenancePlanList.vue
@@ -1,6 +1,6 @@
<template>
<a-card
- title="涓撲笟淇濆吇鏂规"
+ title="棰勯槻鎬т繚鍏绘柟妗�"
:bordered='false'
>
<div class='table-page-search-wrapper'>
diff --git a/src/views/eam/SpecialtyMaintenanceStandardList.vue b/src/views/eam/SpecialtyMaintenanceStandardList.vue
index a8c6986..cf259b8 100644
--- a/src/views/eam/SpecialtyMaintenanceStandardList.vue
+++ b/src/views/eam/SpecialtyMaintenanceStandardList.vue
@@ -1,6 +1,6 @@
<template>
<a-card
- title="涓撲笟淇濆吇鏍囧噯"
+ title="棰勯槻鎬т繚鍏绘爣鍑�"
:bordered='false'
>
<div class='table-page-search-wrapper'>
@@ -15,9 +15,9 @@
:md='8'
:sm='24'
>
- <a-form-item label='璁惧缂栫爜'>
+ <a-form-item label='缁熶竴缂栫爜'>
<a-input
- placeholder='璇疯緭鍏ヨ澶囩紪鐮�'
+ placeholder='璇疯緭鍏ョ粺涓�缂栫爜'
v-model='queryParam.num'
></a-input>
</a-form-item>
@@ -255,31 +255,16 @@
return parseInt(index) + 1
}
},
- {
- title: '鐗堟湰',
- align: 'center',
- dataIndex: 'version',
- width: 100,
- },
- {
- title: '鐗堟湰鐘舵��',
- align: 'center',
- dataIndex: 'versionStatusName',
- width: 130,
- },
+
{
title: '鏍囧噯缂栫爜',
align: 'center',
dataIndex: 'num',
},
- {
- title: '瀵硅薄閮ㄩ棬',
- align: 'center',
- dataIndex: 'useDepartName',
- },
+
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum',
},
@@ -294,19 +279,34 @@
dataIndex: 'equipmentModel',
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ dataIndex: 'useDepartName',
+ },
+ {
title: '鐗圭璁惧',
align: 'center',
dataIndex: 'specificEquipment',
},
+ // {
+ // title: '鐢熸晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'takeEffectTime',
+ // },
+ // {
+ // title: '澶辨晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'loseEfficacyTime',
+ // },
{
- title: '鐢熸晥鏃堕棿',
+ title: '鐗堟湰',
align: 'center',
- dataIndex: 'takeEffectTime',
+ dataIndex: 'version',
},
{
- title: '澶辨晥鏃堕棿',
+ title: '鐗堟湰鐘舵��',
align: 'center',
- dataIndex: 'loseEfficacyTime',
+ dataIndex: 'versionStatusName',
},
{
title: '鍒涘缓浜�',
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
index 5537e21..a21d64d 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
@@ -477,6 +477,7 @@
getInspectionCycles: "/eam/inspectionOrder/getInspectionCycles",
getInspectionProjectId: "/eam/inspectionOrder/getInspectionProjectId",
// getEquipmentIdById: "/eam/equipment/list",
+ getNum: '/eam/sysIdentity/getNumNew'
},
dataSource: [],
@@ -489,6 +490,7 @@
methods: {
add() {
this.edit({ startWorkCondition: "1", inspectionOrderDetails: [] })
+ this.getSeq()
},
edit(record) {
@@ -574,6 +576,15 @@
})
},
+
+ getSeq() {
+ getAction(this.url.getNum, { type: 'DailylnspectionOrder', length: 4 }).then(res => {
+ if (res.success) {
+ this.form.setFieldsValue({ "num": res.result })
+ }
+ })
+ },
+
// getEquipmentIdById(equipmentId) {
// if (equipmentId != null && equipmentId != "") {
// getAction(this.url.getEquipmentIdById, { id: equipmentId }).then((res) => {
diff --git a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
index 4c933fc..f4cdf85 100644
--- a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
@@ -31,7 +31,7 @@
</a-col>
<a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
@@ -47,7 +47,7 @@
style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
:tree-data="treeData"
- placeholder="璇烽�夋嫨瀵硅薄閮ㄩ棬"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
tree-default-expand-all
v-decorator="['useId', validatorRules.useId ]"
/>
@@ -320,21 +320,21 @@
align: 'center',
dataIndex: 'detectionStandard'
},
- {
- title: '鍚堟牸鑼冨洿',
- align: 'center',
- dataIndex: 'acceptabilityLimit'
- },
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'inspectionMethodName'
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'inspectionTool'
- },
+ // {
+ // title: '鍚堟牸鑼冨洿',
+ // align: 'center',
+ // dataIndex: 'acceptabilityLimit'
+ // },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'inspectionMethodName'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'inspectionTool'
+ // },
{
title: '鍛ㄦ湡',
align: 'center',
@@ -418,6 +418,7 @@
revise: '/eam/inspectionStandard/revise',
getReviseVersion: "/eam/inspectionStandard/getReviseVersion",
loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
+ getNum: '/eam/sysIdentity/getNumNew'
},
dataSource: [],
@@ -458,6 +459,7 @@
add() {
this.edit({ dailyInspectionStandardDetaillist: [] })
+ this.getSeq()
},
edit(record) {
@@ -494,6 +496,14 @@
}
},
+ getSeq() {
+ getAction(this.url.getNum, { type: 'DailylnspectionStandard', length: 4 }).then(res => {
+ if (res.success) {
+ this.form.setFieldsValue({ "num": res.result })
+ }
+ })
+ },
+
initOptions() {
getAction(this.url.loadOptions).then(res => {
if (res.success) {
diff --git a/src/views/eam/modules/dailyInspectionStandard/EquipmentList.vue b/src/views/eam/modules/dailyInspectionStandard/EquipmentList.vue
index 388740a..05c49c6 100644
--- a/src/views/eam/modules/dailyInspectionStandard/EquipmentList.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/EquipmentList.vue
@@ -21,9 +21,9 @@
:md="6"
:sm="8"
>
- <a-form-item label="璁惧缂栧彿">
+ <a-form-item label="缁熶竴缂栫爜">
<j-input
- placeholder="璇疯緭鍏ユ爣鍑嗙紪鍙锋绱�"
+ placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�"
v-model="queryParam.num"
></j-input>
</a-form-item>
@@ -144,7 +144,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
},
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceStandardList.vue b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceStandardList.vue
index e4b805c..5667dad 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceStandardList.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceStandardList.vue
@@ -123,7 +123,7 @@
dataIndex: 'num',
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum',
},
@@ -161,7 +161,7 @@
list(useId) {
this.visible = true;
this.useId = useId;
- this.queryParam = { type: "daily", delFlag: '0', useId: useId,versionStatus:'2' };
+ this.queryParam = { type: "daily", delFlag: '0', useId: useId, versionStatus: '2' };
this.loadData(1);
},
clickThenCheck(record) {
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
index 4cf31ae..a199f59 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
@@ -28,13 +28,13 @@
</a-col>
<a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-select
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨瀵硅薄閮ㄩ棬'"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨浣跨敤閮ㄩ棬'"
:options="this.departs"
style="width: 100%"
v-decorator="['useId', validatorRules.useId]"
@@ -72,14 +72,14 @@
<a-col :span="12">
<a-form-item
- label="璁惧缂栫爜/鍚嶇О/鍨嬪彿"
+ label="缁熶竴缂栫爜/鍚嶇О/鍨嬪彿"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentNum', validatorRules.equipmentNum ]"
/>
</a-form-item>
@@ -533,6 +533,7 @@
getMaintenanceProjectList: "/eam/dailyMaintenanceOrder/getMaintenanceProjectId",
getSysDeparts: "/eam/dailyMaintenanceOrder/getSysDeparts",
list: "/eam/dailyMaintenanceOrder/getMaintenanceCycleByStandardId",
+ getNum: '/eam/sysIdentity/getNumNew'
},
}
@@ -541,6 +542,7 @@
methods: {
add() {
this.edit({})
+ this.getSeq()
},
edit(record) {
@@ -669,6 +671,14 @@
})
},
+ getSeq() {
+ getAction(this.url.getNum, { type: 'MaintenanceOrder', length: 4 }).then(res => {
+ if (res.success) {
+ this.form.setFieldsValue({ "num": res.result })
+ }
+ })
+ },
+
handle3Change(val) {
let data = this.form.getFieldsValue(['maintenanceStandardId']);
getAction(this.url.getMaintenanceProjectList, { maintenanceStandardId: data.maintenanceStandardId, maintenanceCycleId: val }).then((res) => {
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
index efb6d23..f1bdb59 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
@@ -152,17 +152,17 @@
dataIndex: 'standard',
},
- {
- title: '鏂规硶',
- align: "center",
- dataIndex: 'maintenanceMethodName',
+ // {
+ // title: '鏂规硶',
+ // align: "center",
+ // dataIndex: 'maintenanceMethodName',
- },
- {
- title: '宸ュ叿',
- align: "center",
- dataIndex: 'maintenanceTool',
- },
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: "center",
+ // dataIndex: 'maintenanceTool',
+ // },
{
title: '瀹夊叏瑕佹眰',
align: "center",
@@ -178,11 +178,11 @@
align: "center",
dataIndex: 'maintenanceCycleName',
},
- {
- title: '缁翠繚涓撲笟',
- align: "center",
- dataIndex: 'maintenanceSpecialtyName',
- },
+ // {
+ // title: '缁翠繚涓撲笟',
+ // align: "center",
+ // dataIndex: 'maintenanceSpecialtyName',
+ // },
{
title: '缁翠慨淇濆吇瑙掕壊',
align: "center",
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
index a4a0d70..07c1959 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
@@ -29,7 +29,7 @@
</a-col>
<a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
@@ -461,21 +461,21 @@
align: 'center',
dataIndex: 'standard'
},
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'maintenanceMethodName'
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'maintenanceTool'
- },
- {
- title: '缁翠繚涓撲笟',
- align: 'center',
- dataIndex: 'maintenanceSpecialtyName'
- },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'maintenanceMethodName'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'maintenanceTool'
+ // },
+ // {
+ // title: '缁翠繚涓撲笟',
+ // align: 'center',
+ // dataIndex: 'maintenanceSpecialtyName'
+ // },
{
title: '瀹夊叏瑕佹眰',
align: 'center',
@@ -592,6 +592,7 @@
revise: '/eam/maintenanceStandard/revise',
getReviseVersion: "/eam/maintenanceStandard/getReviseVersion",
loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
+ getNum: '/eam/sysIdentity/getNumNew'
},
dataSource: [],
@@ -660,6 +661,7 @@
add() {
this.edit({ maintenanceStandardDetaillist: [] })
+ this.getSeq()
},
edit(record) {
@@ -708,6 +710,13 @@
})
},
+ getSeq() {
+ getAction(this.url.getNum, { type: 'DailyMaintenanceStandard', length: 4 }).then(res => {
+ if (res.success) {
+ this.form.setFieldsValue({ "num": res.result })
+ }
+ })
+ },
onEquipmentList() {
let data = this.form.getFieldsValue(['departId']);
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
index a0b2938..fc2167c 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
@@ -102,21 +102,21 @@
align: 'center',
dataIndex: 'standard'
},
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'maintenanceMethod_dictText'
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'maintenanceTool'
- },
- {
- title: '缁翠繚涓撲笟',
- align: 'center',
- dataIndex: 'maintenanceSpecialtyId_dictText'
- },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'maintenanceMethod_dictText'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'maintenanceTool'
+ // },
+ // {
+ // title: '缁翠繚涓撲笟',
+ // align: 'center',
+ // dataIndex: 'maintenanceSpecialtyId_dictText'
+ // },
{
title: '淇濆吇閮ㄤ綅',
align: 'center',
diff --git a/src/views/eam/modules/inspectionProject/InspectionProjectModel.vue b/src/views/eam/modules/inspectionProject/InspectionProjectModel.vue
index d8a3288..b78c688 100644
--- a/src/views/eam/modules/inspectionProject/InspectionProjectModel.vue
+++ b/src/views/eam/modules/inspectionProject/InspectionProjectModel.vue
@@ -29,7 +29,7 @@
/>
</a-form-item>
</a-col>
- </a-row>
+ <!-- </a-row>
<a-row :gutter="24">
<a-col :span="12">
<a-form-item
@@ -39,12 +39,12 @@
>
<a-input
allow-clear
- :disabled="codeDisable"
+ :disabled="disableSubmit"
:placeholder="disableSubmit?'':'璇疯緭鍏ョ偣妫�椤圭洰缂栧彿'"
v-decorator="['num', validatorRules.num ]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="12">
<a-form-item
label="鐐规椤圭洰鍚嶇О"
@@ -61,22 +61,7 @@
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
- <a-form-item
- label="璁￠噺鍗曚綅"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <j-dict-select-tag
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨璁￠噺鍗曚綅'"
- :triggerChange="true"
- dictCode="mom_base_unit,name,id,status!='0' and del_flag!='1'"
- v-decorator="['unitId', validatorRules.unitId]"
- />
- </a-form-item>
- </a-col>
+
<a-col :span="12">
<a-form-item
label="妫�楠屽�肩被鍨�"
@@ -91,6 +76,23 @@
dictCode="test_value_type"
v-decorator="['testValueType', validatorRules.testValueType]"
@change="(e)=>handleChange(e)"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ v-if="testValueType == '2'"
+ :span="12"
+ >
+ <a-form-item
+ label="妫�娴嬫爣鍑�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="disableSubmit"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ユ娴嬫爣鍑�'"
+ v-decorator="['detectionStandard', validatorRules.detectionStandard ]"
/>
</a-form-item>
</a-col>
@@ -113,23 +115,7 @@
/>
</a-form-item>
</a-col> -->
- <a-col
- v-if="testValueType == '2'"
- :span="12"
- >
- <a-form-item
- label="妫�娴嬫爣鍑�"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ユ娴嬫爣鍑�'"
- v-decorator="['detectionStandard', validatorRules.detectionStandard ]"
- />
- </a-form-item>
- </a-col>
+
<a-col
v-if="testValueType == '1'"
:span="12"
@@ -203,6 +189,22 @@
</a-col>
<a-col :span="12">
<a-form-item
+ label="璁￠噺鍗曚綅"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="disableSubmit"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨璁￠噺鍗曚綅'"
+ :triggerChange="true"
+ dictCode="mom_base_unit,name,id,status!='0' and del_flag!='1'"
+ v-decorator="['unitId', validatorRules.unitId]"
+ />
+ </a-form-item>
+ </a-col>
+ <!-- <a-col :span="12">
+ <a-form-item
label="鐐规宸ュ叿"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -214,7 +216,7 @@
v-decorator="['inspectionTool', validatorRules.inspectionTool ]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
</a-row>
<a-row :gutter="24">
@@ -372,7 +374,12 @@
if (record.id) {
this.codeDisable = true;
} else {
+ debugger
this.codeDisable = false;
+ this.$nextTick(() => {
+ this.form.setFieldsValue({ "testValueType": '2' })
+ this.testValueType = '2'
+ });
}
},
diff --git a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
index 93c9582..aa044fa 100644
--- a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
+++ b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
@@ -10,7 +10,7 @@
@keyup.enter.native="searchQuery"
>
<a-row :gutter="24">
- <a-col
+ <!-- <a-col
:md="8"
:sm="8"
>
@@ -20,7 +20,7 @@
v-model="queryParam.num"
></j-input>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col
:md="8"
:sm="8"
@@ -244,37 +244,28 @@
},
width: 50,
},
+ // {
+ // title: '椤圭洰缂栫爜',
+ // align: 'center',
+ // dataIndex: 'num',
+ // scopedSlots: {
+ // customRender: 'num'
+ // },
+ // },
{
- title: '椤圭洰缂栫爜',
- align: 'center',
- dataIndex: 'num',
- scopedSlots: {
- customRender: 'num'
- },
- },
- {
- title: '椤圭洰鍚嶇О',
+ title: '鐐规椤圭洰',
align: 'center',
dataIndex: 'name',
scopedSlots: {
customRender: 'name'
},
},
- {
- title: '璁￠噺鍗曚綅',
- align: 'center',
- dataIndex: 'unitId_dictText',
- },
+
// {
// title: '鍒嗘瀽鏂规硶',
// align: 'center',
// dataIndex: 'analysisMethod_dictText',
// },
- {
- title: '妫�楠屽�肩被鍨�',
- align: "center",
- dataIndex: 'testValueType_dictText',
- },
{
title: '妫�娴嬫爣鍑�',
align: "center",
@@ -291,11 +282,21 @@
dataIndex: 'inspectionMethod_dictText',
},
{
- title: '鐐规宸ュ叿',
+ title: '妫�楠屽�肩被鍨�',
align: "center",
- dataIndex: 'inspectionTool',
+ dataIndex: 'testValueType_dictText',
},
{
+ title: '璁￠噺鍗曚綅',
+ align: 'center',
+ dataIndex: 'unitId_dictText',
+ },
+ // {
+ // title: '鐐规宸ュ叿',
+ // align: "center",
+ // dataIndex: 'inspectionTool',
+ // },
+ {
title: '鍒涘缓浜�',
align: "center",
dataIndex: 'createBy',
diff --git a/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue b/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
index b2cc3cb..399bc98 100644
--- a/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
+++ b/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
@@ -2,30 +2,55 @@
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<!-- 涓昏〃鍗曞尯鍩� -->
- <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+ <a-form-model
+ ref="form"
+ :model="model"
+ :rules="validatorRules"
+ slot="detail"
+ >
<a-row>
- <a-col :span="12" >
- <a-form-model-item label="璁″垝鍗曞彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
- <a-input v-model="model.num" placeholder="璇疯緭鍏ヨ鍒掑崟鍙�" ></a-input>
+ <a-col :span="12">
+ <a-form-model-item
+ label="璁″垝鍗曞彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="num"
+ >
+ <a-input
+ v-model="model.num"
+ placeholder="璇疯緭鍏ヨ鍒掑崟鍙�"
+ ></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="12" >
- <a-form-model-item label="璁″垝鍗曠被鍨�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+ <a-col :span="12">
+ <a-form-model-item
+ label="璁″垝鍗曠被鍨�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="type"
+ >
<j-dict-select-tag
allow-clear
placeholder="璇烽�夋嫨璁″垝鍗曠被鍨�"
:triggerChange="true"
dictCode="maintenance_type"
- v-model="model.type"
+ v-model="model.type"
/>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
- <!-- 瀛愯〃鍗曞尯鍩� -->
- <a-tabs v-model="activeKey" @change="handleChangeTabs">
- <a-tab-pane tab="淇濆吇璁″垝鏄庣粏" :key="refKeys[0]" :forceRender="true">
+ <!-- 瀛愯〃鍗曞尯鍩� -->
+ <a-tabs
+ v-model="activeKey"
+ @change="handleChangeTabs"
+ >
+ <a-tab-pane
+ tab="淇濆吇璁″垝鏄庣粏"
+ :key="refKeys[0]"
+ :forceRender="true"
+ >
<j-vxe-table
keep-source
:ref="refKeys[0]"
@@ -40,247 +65,257 @@
bordered
:alwaysEdit="true"
:toolbarConfig='toolbarConfig'
- >
+ >
<template slot='toolbarPrefix'>
- <a-button type='primary' @click='standardSelect' :disabled="formDisabled" icon="plus">璁惧-淇濆吇鏍囧噯
+ <a-button
+ type='primary'
+ @click='standardSelect'
+ :disabled="formDisabled"
+ icon="plus"
+ >璁惧-淇濆吇鏍囧噯
</a-button>
</template>
</j-vxe-table>
</a-tab-pane>
</a-tabs>
- <standard-select @selectionRows='selectionRows' ref='standardSelectModel' ></standard-select>
+ <standard-select
+ @selectionRows='selectionRows'
+ ref='standardSelectModel'
+ ></standard-select>
</a-spin>
</template>
<script>
- import { getAction } from '@/api/manage'
- import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
- import { JVXETypes } from '@/components/jeecg/JVxeTable'
- import { getRefPromise,VALIDATE_FAILED} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
- import { validateDuplicateValue } from '@/utils/util'
- import JFormContainer from '@/components/jeecg/JFormContainer'
- import StandardSelect from './StandardSelect'
- import { duplicateCheck } from '@/api/api'
- import dayjs from 'dayjs'
+import { getAction } from '@/api/manage'
+import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
+import { JVXETypes } from '@/components/jeecg/JVxeTable'
+import { getRefPromise, VALIDATE_FAILED } from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
+import { validateDuplicateValue } from '@/utils/util'
+import JFormContainer from '@/components/jeecg/JFormContainer'
+import StandardSelect from './StandardSelect'
+import { duplicateCheck } from '@/api/api'
+import dayjs from 'dayjs'
- export default {
- name: 'EquipmentMaintenancePlanForm',
- mixins: [JVxeTableModelMixin],
- components: {
- JFormContainer,
- StandardSelect,
- dayjs
- },
- data() {
- return {
- toolbarConfig: {
+export default {
+ name: 'EquipmentMaintenancePlanForm',
+ mixins: [JVxeTableModelMixin],
+ components: {
+ JFormContainer,
+ StandardSelect,
+ dayjs
+ },
+ data() {
+ return {
+ toolbarConfig: {
// prefix 鍓嶇紑锛泂uffix 鍚庣紑
slot: ['prefix', 'suffix'],
// add 鏂板鎸夐挳锛況emove 鍒犻櫎鎸夐挳锛沜learSelection 娓呯┖閫夋嫨鎸夐挳
btn: ['remove', 'clearSelection']
- },
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 },
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 16 },
- },
- model:{
- },
- // 鏂板鏃跺瓙琛ㄩ粯璁ゆ坊鍔犲嚑琛岀┖鏁版嵁
- addDefaultRowNum: 0,
- validatorRules: {
- num: [
+ },
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ model: {
+ },
+ // 鏂板鏃跺瓙琛ㄩ粯璁ゆ坊鍔犲嚑琛岀┖鏁版嵁
+ addDefaultRowNum: 0,
+ validatorRules: {
+ num: [
{ required: true, message: '璇疯緭鍏ョ紪鐮�!' },
{ min: 1, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
{ validator: this.validateNum },
],
- type: [
+ type: [
{ required: true, message: '璇烽�夋嫨璁″垝鍗曠被鍨�!' },
],
- },
- refKeys: ['equipmentMaintenancePlanDetail', ],
- tableKeys:['equipmentMaintenancePlanDetail', ],
- activeKey: 'equipmentMaintenancePlanDetail',
- // 淇濆吇璁″垝鏄庣粏
- equipmentMaintenancePlanDetailTable: {
- loading: false,
- dataSource: [
- ],
- columns: [
+ },
+ refKeys: ['equipmentMaintenancePlanDetail',],
+ tableKeys: ['equipmentMaintenancePlanDetail',],
+ activeKey: 'equipmentMaintenancePlanDetail',
+ // 淇濆吇璁″垝鏄庣粏
+ equipmentMaintenancePlanDetailTable: {
+ loading: false,
+ dataSource: [
+ ],
+ columns: [
{
- title: '淇濆吇鏍囧噯id',
- key: 'standardId',
- type: JVXETypes.hidden,
- placeholder: '璇疯緭鍏�${title}',
- defaultValue: '',
- align:'center',
- width:"230px",
- },
- {
- title: '淇濆吇鏍囧噯',
- key: 'standardNum',
- type: JVXETypes.normal,
- placeholder: '璇疯緭鍏�${title}',
- defaultValue: '',
- align:'center',
- width:"230px",
- },
- {
- title: '璁惧缁熶竴缂栫爜',
- key: 'equipmentNum',
- type: JVXETypes.normal,
- placeholder: '璇疯緭鍏�${title}',
- defaultValue: '',
- align:'center',
- width:"230px",
- },
- {
- title: '璁惧鍚嶇О',
- key: 'equipmentName',
- type: JVXETypes.normal,
- placeholder: '璇疯緭鍏�${title}',
- defaultValue: '',
- align:'center',
- width:"230px",
- },
- {
- title: '璁惧鍨嬪彿',
- key: 'model',
- type: JVXETypes.normal,
- placeholder: '璇疯緭鍏�${title}',
- defaultValue: '',
- align:'center',
- width:"230px",
- },
- {
- title: '璁″垝寮�濮嬫椂闂�',
- key: 'planStartTime',
- type: JVXETypes.datetime,
- placeholder: '璇疯緭鍏�${title}',
- align:'center',
- width:"250px",
- validateRules: [
- {
- required: true, // 蹇呭～
- message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
- },
- {
- handler({ cellValue, row, column }, callback, target) {
- var start = dayjs(cellValue);
- var end = dayjs(row.planEndTime);
- if (!start.isBefore(end)) {
- callback(false, '缁撴潫鏃堕棿闇�婊炲悗浜庡紑濮嬫椂闂�') // false = 鏈�氳繃锛屽彲浠ヨ窡鑷畾涔夋彁绀�
- } else {
- callback(true) // true = 閫氳繃楠岃瘉
- }
- },
- message: '${title}榛樿鎻愮ず'
- }
- ]
- },
- {
- title: '璁″垝缁撴潫鏃堕棿',
- key: 'planEndTime',
- type: JVXETypes.datetime,
- placeholder: '璇疯緭鍏�${title}',
- align:'center',
- width:"250px",
- validateRules: [
- {
- required: true, // 蹇呭～
- message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
- },
- {
- handler({ cellValue, row, column }, callback, target) {
- var start = dayjs(row.planStartTime);
- var end = dayjs(cellValue);
- if (!start.isBefore(end)) {
- callback(false, '缁撴潫鏃堕棿闇�婊炲悗浜庡紑濮嬫椂闂�') // false = 鏈�氳繃锛屽彲浠ヨ窡鑷畾涔夋彁绀�
- } else {
- callback(true) // true = 閫氳繃楠岃瘉
- }
- },
- message: '${title}榛樿鎻愮ず'
- }
- ]
- },
- ]
- },
- url: {
- add: "/eam/equipmentMaintenancePlan/add",
- edit: "/eam/equipmentMaintenancePlan/edit",
- queryById: "/eam/equipmentMaintenancePlan/queryById",
- equipmentMaintenancePlanDetail: {
- list: '/eam/equipmentMaintenancePlan/listEquipmentMaintenancePlanDetailByMainId'
+ title: '淇濆吇鏍囧噯id',
+ key: 'standardId',
+ type: JVXETypes.hidden,
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue: '',
+ align: 'center',
+ width: "230px",
},
- }
- }
- },
- props: {
- //琛ㄥ崟绂佺敤
- disabled: {
- type: Boolean,
- default: false,
- required: false
- }
- },
- computed: {
- formDisabled(){
- return this.disabled
+ {
+ title: '淇濆吇鏍囧噯',
+ key: 'standardNum',
+ type: JVXETypes.normal,
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue: '',
+ align: 'center',
+ width: "230px",
+ },
+ {
+ title: '璁惧缁熶竴缂栫爜',
+ key: 'equipmentNum',
+ type: JVXETypes.normal,
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue: '',
+ align: 'center',
+ width: "230px",
+ },
+ {
+ title: '璁惧鍚嶇О',
+ key: 'equipmentName',
+ type: JVXETypes.normal,
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue: '',
+ align: 'center',
+ width: "230px",
+ },
+ {
+ title: '璁惧鍨嬪彿',
+ key: 'model',
+ type: JVXETypes.normal,
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue: '',
+ align: 'center',
+ width: "230px",
+ },
+ {
+ title: '璁″垝寮�濮嬫椂闂�',
+ key: 'planStartTime',
+ type: JVXETypes.datetime,
+ placeholder: '璇疯緭鍏�${title}',
+ align: 'center',
+ width: "250px",
+ validateRules: [
+ {
+ required: true, // 蹇呭～
+ message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ },
+ {
+ handler({ cellValue, row, column }, callback, target) {
+ var start = dayjs(cellValue);
+ var end = dayjs(row.planEndTime);
+ if (!start.isBefore(end)) {
+ callback(false, '缁撴潫鏃堕棿闇�婊炲悗浜庡紑濮嬫椂闂�') // false = 鏈�氳繃锛屽彲浠ヨ窡鑷畾涔夋彁绀�
+ } else {
+ callback(true) // true = 閫氳繃楠岃瘉
+ }
+ },
+ message: '${title}榛樿鎻愮ず'
+ }
+ ]
+ },
+ {
+ title: '璁″垝缁撴潫鏃堕棿',
+ key: 'planEndTime',
+ type: JVXETypes.datetime,
+ placeholder: '璇疯緭鍏�${title}',
+ align: 'center',
+ width: "250px",
+ validateRules: [
+ {
+ required: true, // 蹇呭～
+ message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ },
+ {
+ handler({ cellValue, row, column }, callback, target) {
+ var start = dayjs(row.planStartTime);
+ var end = dayjs(cellValue);
+ if (!start.isBefore(end)) {
+ callback(false, '缁撴潫鏃堕棿闇�婊炲悗浜庡紑濮嬫椂闂�') // false = 鏈�氳繃锛屽彲浠ヨ窡鑷畾涔夋彁绀�
+ } else {
+ callback(true) // true = 閫氳繃楠岃瘉
+ }
+ },
+ message: '${title}榛樿鎻愮ず'
+ }
+ ]
+ },
+ ]
},
- },
- created () {
- },
- methods: {
- addBefore(){
- this.equipmentMaintenancePlanDetailTable.dataSource=[]
- },
- getAllTable() {
- let values = this.tableKeys.map(key => getRefPromise(this, key))
- return Promise.all(values)
- },
- /** 璋冪敤瀹宔dit()鏂规硶涔嬪悗浼氳嚜鍔ㄨ皟鐢ㄦ鏂规硶 */
- editAfter() {
- this.$nextTick(() => {
- })
- // 鍔犺浇瀛愯〃鏁版嵁
- if (this.model.id) {
- let params = { planId: this.model.id }
- this.requestSubTableData(this.url.equipmentMaintenancePlanDetail.list, params, this.equipmentMaintenancePlanDetailTable)
- }
- },
- //鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
- validateSubForm(allValues){
- return new Promise((resolve,reject)=>{
- Promise.all([
- ]).then(() => {
- resolve(allValues)
- }).catch(e => {
- if (e.error === VALIDATE_FAILED) {
- // 濡傛灉鏈夋湭閫氳繃琛ㄥ崟楠岃瘉鐨勫瓙琛紝灏辫嚜鍔ㄨ烦杞埌瀹冩墍鍦ㄧ殑tab
- this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
- } else {
- console.error(e)
- }
- })
- })
+ url: {
+ add: "/eam/equipmentMaintenancePlan/add",
+ edit: "/eam/equipmentMaintenancePlan/edit",
+ queryById: "/eam/equipmentMaintenancePlan/queryById",
+ equipmentMaintenancePlanDetail: {
+ list: '/eam/equipmentMaintenancePlan/listEquipmentMaintenancePlanDetailByMainId'
},
- /** 鏁寸悊鎴恌ormData */
- classifyIntoFormData(allValues) {
- let main = Object.assign(this.model, allValues.formValue)
- return {
- ...main, // 灞曞紑
- equipmentMaintenancePlanDetailList: allValues.tablesValue[0].tableData,
- }
- },
- validateError(msg){
- this.$message.error(msg)
- },
- standardSelect() {
+ getNum: '/eam/sysIdentity/getNumNew'
+ }
+ }
+ },
+ props: {
+ //琛ㄥ崟绂佺敤
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: false
+ }
+ },
+ computed: {
+ formDisabled() {
+ return this.disabled
+ },
+ },
+ created() {
+ },
+ methods: {
+ addBefore() {
+ this.equipmentMaintenancePlanDetailTable.dataSource = []
+ this.getSeq()
+ },
+ getAllTable() {
+ let values = this.tableKeys.map(key => getRefPromise(this, key))
+ return Promise.all(values)
+ },
+ /** 璋冪敤瀹宔dit()鏂规硶涔嬪悗浼氳嚜鍔ㄨ皟鐢ㄦ鏂规硶 */
+ editAfter() {
+ this.$nextTick(() => {
+ })
+ // 鍔犺浇瀛愯〃鏁版嵁
+ if (this.model.id) {
+ let params = { planId: this.model.id }
+ this.requestSubTableData(this.url.equipmentMaintenancePlanDetail.list, params, this.equipmentMaintenancePlanDetailTable)
+ }
+ },
+ //鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
+ validateSubForm(allValues) {
+ return new Promise((resolve, reject) => {
+ Promise.all([
+ ]).then(() => {
+ resolve(allValues)
+ }).catch(e => {
+ if (e.error === VALIDATE_FAILED) {
+ // 濡傛灉鏈夋湭閫氳繃琛ㄥ崟楠岃瘉鐨勫瓙琛紝灏辫嚜鍔ㄨ烦杞埌瀹冩墍鍦ㄧ殑tab
+ this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
+ } else {
+ console.error(e)
+ }
+ })
+ })
+ },
+ /** 鏁寸悊鎴恌ormData */
+ classifyIntoFormData(allValues) {
+ let main = Object.assign(this.model, allValues.formValue)
+ return {
+ ...main, // 灞曞紑
+ equipmentMaintenancePlanDetailList: allValues.tablesValue[0].tableData,
+ }
+ },
+ validateError(msg) {
+ this.$message.error(msg)
+ },
+ standardSelect() {
let ids = []
let tableData = this.$refs.equipmentMaintenancePlanDetail.getTableData()
for (let i = 0; i < tableData.length; i++) {
@@ -298,12 +333,12 @@
var equipmentMaintenancePlanDetail = {}
if (tableStr.indexOf(data[i].id) == -1) {
equipmentMaintenancePlanDetail = {
- standardId:data[i].id,
+ standardId: data[i].id,
standardNum: data[i].num,
- equipmentNum:data[i].equipmentNum,
- equipmentName:data[i].equipmentName,
- model:data[i].equipmentModel,
- planId:this.model.id,
+ equipmentNum: data[i].equipmentNum,
+ equipmentName: data[i].equipmentName,
+ model: data[i].equipmentModel,
+ planId: this.model.id,
}
}
addRows.push(equipmentMaintenancePlanDetail)
@@ -332,9 +367,15 @@
})
},
-
- }
+ getSeq() {
+ getAction(this.url.getNum, { type: 'MaintenancePlan', length: 4 }).then(res => {
+ if (res.success) {
+ this.model.num = res.result
+ }
+ })
+ },
}
+}
</script>
<style scoped>
diff --git a/src/views/eam/modules/maintenancePlan/StandardSelect.vue b/src/views/eam/modules/maintenancePlan/StandardSelect.vue
index 46b3804..446c85f 100644
--- a/src/views/eam/modules/maintenancePlan/StandardSelect.vue
+++ b/src/views/eam/modules/maintenancePlan/StandardSelect.vue
@@ -94,30 +94,19 @@
return parseInt(index) + 1
}
},
- {
- title: '鐗堟湰',
- align: 'center',
- dataIndex: 'version',
- width: 100,
- },
- {
- title: '鐗堟湰鐘舵��',
- align: 'center',
- dataIndex: 'versionStatusName',
- width: 130,
- },
+
{
title: '鏍囧噯缂栫爜',
align: 'center',
dataIndex: 'num',
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: 'center',
dataIndex: 'useDepartName',
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum',
},
@@ -131,6 +120,16 @@
align: 'center',
dataIndex: 'equipmentModel',
},
+ {
+ title: '鐗堟湰',
+ align: 'center',
+ dataIndex: 'version',
+ },
+ {
+ title: '鐗堟湰鐘舵��',
+ align: 'center',
+ dataIndex: 'versionStatusName',
+ },
],
selectedRowKeys: [],
oldSlelectRows: [],
diff --git a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
index 6490ffe..083f2da 100644
--- a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
+++ b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
@@ -62,7 +62,7 @@
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
+ <!-- <a-col :span="12">
<a-form-item
label="淇濆吇椤圭洰缂栧彿"
:labelCol="labelCol"
@@ -70,12 +70,12 @@
>
<a-input
allow-clear
- :disabled="codeDisable"
+ :disabled="disableSubmit"
:placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏婚」鐩紪鍙�'"
v-decorator="['num', validatorRules.num ]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="12">
<a-form-item
label="淇濆吇椤圭洰鍚嶇О"
@@ -87,6 +87,20 @@
:disabled="disableSubmit"
:placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏婚」鐩悕绉�'"
v-decorator="['name', validatorRules.name ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item
+ label="淇濆吇鏍囧噯"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="disableSubmit"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏绘爣鍑�'"
+ v-decorator="['standard', validatorRules.standard ]"
/>
</a-form-item>
</a-col>
@@ -125,21 +139,8 @@
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
- <a-form-item
- label="淇濆吇鏍囧噯"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏绘爣鍑�'"
- v-decorator="['standard', validatorRules.standard ]"
- />
- </a-form-item>
- </a-col>
- <a-col :span="12">
+
+ <!-- <a-col :span="12">
<a-form-item
label="缁翠繚涓撲笟"
:labelCol="labelCol"
@@ -154,7 +155,7 @@
v-decorator="['maintenanceSpecialtyId', validatorRules.maintenanceSpecialtyId]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
</a-row>
<a-row :gutter="24">
<a-col :span="12">
@@ -172,20 +173,7 @@
/>
</a-form-item>
</a-col>
- <a-col :span="12">
- <a-form-item
- label="淇濆吇閮ㄤ綅"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏婚儴浣�'"
- v-decorator="['location', validatorRules.location ]"
- />
- </a-form-item>
- </a-col>
+
</a-row>
<a-row :gutter="24">
<a-col :span="24">
diff --git a/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue b/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue
index 05eb065..1957357 100644
--- a/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue
+++ b/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue
@@ -244,14 +244,14 @@
},
width: 50,
},
- {
- title: '淇濆吇椤圭洰缂栫爜',
- align: 'center',
- dataIndex: 'num',
- scopedSlots: {
- customRender: 'num'
- },
- },
+ // {
+ // title: '淇濆吇椤圭洰缂栫爜',
+ // align: 'center',
+ // dataIndex: 'num',
+ // scopedSlots: {
+ // customRender: 'num'
+ // },
+ // },
{
title: '淇濆吇椤圭洰鍚嶇О',
align: 'center',
@@ -281,11 +281,11 @@
// customRender: 'inspectionTypeId_dictText'
// },
// },
- {
- title: '缁翠繚涓撲笟',
- align: "center",
- dataIndex: 'maintenanceSpecialtyId_dictText',
- },
+ // {
+ // title: '缁翠繚涓撲笟',
+ // align: "center",
+ // dataIndex: 'maintenanceSpecialtyId_dictText',
+ // },
{
title: '瀹夊叏瑕佹眰',
align: "center",
diff --git a/src/views/eam/modules/specialtyMaintenanceOrder/MaintenanceOrderModal.vue b/src/views/eam/modules/specialtyMaintenanceOrder/MaintenanceOrderModal.vue
index 829470a..f70dc22 100644
--- a/src/views/eam/modules/specialtyMaintenanceOrder/MaintenanceOrderModal.vue
+++ b/src/views/eam/modules/specialtyMaintenanceOrder/MaintenanceOrderModal.vue
@@ -46,13 +46,13 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item
- label="涓撲笟淇濆吇鏂规"
+ label="棰勯槻鎬т繚鍏绘柟妗�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input-search
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨涓撲笟淇濆吇鏂规'"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨棰勯槻鎬т繚鍏绘柟妗�'"
enter-button
@search="onSpecialtyMaintenancePlanList()"
:read-only="true"
@@ -260,6 +260,7 @@
url: {
add: "/eam/specialtyMaintenanceOrder/add",
edit: "/eam/specialtyMaintenanceOrder/edit",
+ getNum: '/eam/sysIdentity/getNumNew'
},
}
},
@@ -267,6 +268,7 @@
methods: {
add() {
this.edit({})
+ this.getSeq()
},
edit(record) {
@@ -294,7 +296,7 @@
},
onSpecialtyMaintenancePlanList() {
this.$refs.SpecialtyMaintenancePlanList.list();
- this.$refs.SpecialtyMaintenancePlanList.title = "閫夋嫨涓撲笟淇濆吇鏂规";
+ this.$refs.SpecialtyMaintenancePlanList.title = "閫夋嫨棰勯槻鎬т繚鍏绘柟妗�";
},
sendSpecialtyMaintenancePlanRecord(data) {
let record = data.record;
@@ -308,6 +310,14 @@
}
},
+ getSeq() {
+ getAction(this.url.getNum, { type: 'SpecialtyMaintenanceOrder', length: 4 }).then(res => {
+ if (res.success) {
+ this.form.setFieldsValue({ "num": res.result })
+ }
+ })
+ },
+
handleOk() {
const that = this;
this.form.validateFields((err, values) => {
diff --git a/src/views/eam/modules/specialtyMaintenancePlan/JSelectSpecialtyMaintenanceStandardModal.vue b/src/views/eam/modules/specialtyMaintenancePlan/JSelectSpecialtyMaintenanceStandardModal.vue
index e4a2ba5..f909c58 100644
--- a/src/views/eam/modules/specialtyMaintenancePlan/JSelectSpecialtyMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/specialtyMaintenancePlan/JSelectSpecialtyMaintenanceStandardModal.vue
@@ -107,7 +107,7 @@
dataIndex: 'versionStatusName'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue b/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue
index 24ac3de..6116c44 100644
--- a/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue
+++ b/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue
@@ -29,7 +29,7 @@
</a-col>
<a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
@@ -45,7 +45,7 @@
style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
:tree-data="treeData"
- placeholder="璇烽�夋嫨瀵硅薄閮ㄩ棬"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
tree-default-expand-all
v-decorator="['departId', validatorRules.departId]"
@change="(e)=>handle2Change(e)"
@@ -291,7 +291,7 @@
dataIndex: 'versionStatusName'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
@@ -388,6 +388,7 @@
getMaintenanceCycles: "/eam/maintenanceStandardDetail/getMaintenanceCycle",
getSysDeparts: "/eam/equipment/getSysDeparts",
loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
+ getNum: '/eam/sysIdentity/getNumNew'
},
dataSource: [],
//鐢ㄤ簬灞曠ず鏂囦欢
@@ -436,7 +437,7 @@
selectMaintenanceProjects: function () {
let dataDepartId = this.form.getFieldsValue(['departId']);
if (dataDepartId.departId === "" || dataDepartId.departId === null || dataDepartId.departId === undefined) {
- this.$message.warning("璇烽�夋嫨瀵硅薄閮ㄩ棬锛�");
+ this.$message.warning("璇烽�夋嫨浣跨敤閮ㄩ棬锛�");
return
}
let data = this.form.getFieldsValue(['maintenanceCycleId']);
@@ -491,6 +492,7 @@
add() {
this.edit({ specialtyMaintenancePlanDetailList: [] })
+ this.getSeq()
},
edit(record) {
@@ -549,6 +551,14 @@
})
},
+ getSeq() {
+ getAction(this.url.getNum, { type: 'SpecialtyMaintenancePlan', length: 4 }).then(res => {
+ if (res.success) {
+ this.form.setFieldsValue({ "num": res.result })
+ }
+ })
+ },
+
handleOk() {
const that = this;
// 瑙﹀彂琛ㄥ崟楠岃瘉
diff --git a/src/views/eam/modules/specialtyMaintenanceStandard/EquipmentList.vue b/src/views/eam/modules/specialtyMaintenanceStandard/EquipmentList.vue
index 9f4b943..90e48ff 100644
--- a/src/views/eam/modules/specialtyMaintenanceStandard/EquipmentList.vue
+++ b/src/views/eam/modules/specialtyMaintenanceStandard/EquipmentList.vue
@@ -21,9 +21,9 @@
:md="6"
:sm="8"
>
- <a-form-item label="璁惧缂栧彿">
+ <a-form-item label="缁熶竴缂栫爜">
<j-input
- placeholder="璇疯緭鍏ユ爣鍑嗙紪鍙锋绱�"
+ placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
v-model="queryParam.num"
></j-input>
</a-form-item>
@@ -45,14 +45,14 @@
:sm="8"
v-if="selectedDeparts"
>
- <a-form-item label="瀵硅薄閮ㄩ棬">
+ <a-form-item label="浣跨敤閮ㄩ棬">
<a-select
- allow-clear
- :placeholder="'璇烽�夋嫨瀵硅薄閮ㄩ棬'"
- :options="departs"
- v-model="queryParam.useId"
- style="width: 100%"
- />
+ allow-clear
+ :placeholder="'璇烽�夋嫨浣跨敤閮ㄩ棬'"
+ :options="departs"
+ v-model="queryParam.useId"
+ style="width: 100%"
+ />
</a-form-item>
</a-col>
<a-col
@@ -124,7 +124,7 @@
visible: false,
model: {},
departs: [],
- selectedDeparts:false,
+ selectedDeparts: false,
dataSource: [],
disableSubmit: false,
type: "radio",
@@ -161,7 +161,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
},
@@ -192,7 +192,7 @@
},
}
},
- created(){
+ created() {
this.getSysDeparts()
},
diff --git a/src/views/eam/modules/specialtyMaintenanceStandard/JSelectMaintenanceStandardModal.vue b/src/views/eam/modules/specialtyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
index 64f42bb..e1048d4 100644
--- a/src/views/eam/modules/specialtyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/specialtyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
@@ -102,21 +102,21 @@
align: 'center',
dataIndex: 'standard'
},
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'maintenanceMethod_dictText'
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'maintenanceTool'
- },
- {
- title: '缁翠繚涓撲笟',
- align: 'center',
- dataIndex: 'maintenanceSpecialtyId_dictText'
- },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'maintenanceMethod_dictText'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'maintenanceTool'
+ // },
+ // {
+ // title: '缁翠繚涓撲笟',
+ // align: 'center',
+ // dataIndex: 'maintenanceSpecialtyId_dictText'
+ // },
{
title: '瀹夊叏瑕佹眰',
align: 'center',
diff --git a/src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardDetail.vue b/src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardDetail.vue
index 138e727..3a2acfd 100644
--- a/src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardDetail.vue
+++ b/src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardDetail.vue
@@ -53,9 +53,22 @@
棰勮
</a>
</span> -->
- <template slot="imgSlot" slot-scope="text,record">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
- <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ <template
+ slot="imgSlot"
+ slot-scope="text,record"
+ >
+ <span
+ v-if="!text"
+ style="font-size: 12px;font-style: italic;"
+ >鏃犲浘鐗�</span>
+ <img
+ v-else
+ :src="getImgView(text)"
+ :preview="record.id"
+ height="25px"
+ alt=""
+ style="max-width:80px;font-size: 12px;font-style: italic;"
+ />
</template>
</a-table>
</div>
@@ -137,17 +150,17 @@
dataIndex: 'standard',
},
- {
- title: '鏂规硶',
- align: "center",
- dataIndex: 'maintenanceMethodName',
+ // {
+ // title: '鏂规硶',
+ // align: "center",
+ // dataIndex: 'maintenanceMethodName',
- },
- {
- title: '宸ュ叿',
- align: "center",
- dataIndex: 'maintenanceTool',
- },
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: "center",
+ // dataIndex: 'maintenanceTool',
+ // },
{
title: '瀹夊叏瑕佹眰',
align: "center",
@@ -163,11 +176,11 @@
align: "center",
dataIndex: 'maintenanceCycleName',
},
- {
- title: '缁翠繚涓撲笟',
- align: "center",
- dataIndex: 'maintenanceSpecialtyName',
- },
+ // {
+ // title: '缁翠繚涓撲笟',
+ // align: "center",
+ // dataIndex: 'maintenanceSpecialtyName',
+ // },
{
title: '缁翠繚鏂瑰紡',
align: "center",
@@ -183,10 +196,10 @@
created() {
},
computed: {
- importExcelUrl(){
- return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
- }
- },
+ importExcelUrl() {
+ return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
+ }
+ },
methods: {
clearList() {
this.dataSource = []
diff --git a/src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardModal.vue b/src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardModal.vue
index 8419dfd..9ead2db 100644
--- a/src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardModal.vue
@@ -82,13 +82,13 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- :placeholder="disableSubmit?'':'璇烽�夋嫨瀵硅薄閮ㄩ棬'"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨浣跨敤閮ㄩ棬'"
:triggerChange="true"
:disabled="true"
dictCode="sys_depart,depart_name,id"
@@ -351,24 +351,24 @@
dataIndex: 'standard',
width: 100,
},
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'maintenanceMethodName',
- width: 100,
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'maintenanceTool',
- width: 100,
- },
- {
- title: '缁翠繚涓撲笟',
- align: 'center',
- dataIndex: 'maintenanceSpecialtyName',
- width: 100,
- },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'maintenanceMethodName',
+ // width: 100,
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'maintenanceTool',
+ // width: 100,
+ // },
+ // {
+ // title: '缁翠繚涓撲笟',
+ // align: 'center',
+ // dataIndex: 'maintenanceSpecialtyName',
+ // width: 100,
+ // },
{
title: '瀹夊叏瑕佹眰',
align: 'center',
@@ -482,7 +482,8 @@
getMaintenanceMode: "/eam/maintenanceStandardDetail/getMaintenanceMode",
realDelete: "/eam/maintenanceStandardDetail/realDelete",
revise: '/eam/maintenanceStandard/revise',
- getReviseVersion: "/eam/maintenanceStandard/getReviseVersion"
+ getReviseVersion: "/eam/maintenanceStandard/getReviseVersion",
+ getNum: '/eam/sysIdentity/getNumNew'
},
dataSource: [],
@@ -551,6 +552,7 @@
add() {
this.edit({ maintenanceStandardDetaillist: [] })
+ this.getSeq()
},
@@ -615,31 +617,31 @@
return
}
for (var i = 0; i < that.dataSource.length; i++) {
- if (that.dataSource[i].maintenanceRequire == null || that.dataSource[i].maintenanceRequire == undefined || that.dataSource[i].maintenanceRequire == '') {
- this.$message.error("绗�" + (i + 1) + "琛屽畨鍏ㄨ姹備负绌猴紝璇峰～鍐�")
- that.confirmLoading = false
- return false;
- }
- if (that.dataSource[i].photo == null || that.dataSource[i].photo == undefined || that.dataSource[i].photo == '') {
- this.$message.error("绗�" + (i + 1) + "琛岀ず鎰忓浘涓虹┖锛岃涓婁紶")
- that.confirmLoading = false
- return false;
- }
- if (that.dataSource[i].location == null || that.dataSource[i].location == undefined || that.dataSource[i].location == '') {
- this.$message.error("绗�" + (i + 1) + "琛岄儴浣嶄负绌猴紝璇峰～鍐�")
- that.confirmLoading = false
- return false;
- }
+ // if (that.dataSource[i].maintenanceRequire == null || that.dataSource[i].maintenanceRequire == undefined || that.dataSource[i].maintenanceRequire == '') {
+ // this.$message.error("绗�" + (i + 1) + "琛屽畨鍏ㄨ姹備负绌猴紝璇峰～鍐�")
+ // that.confirmLoading = false
+ // return false;
+ // }
+ // if (that.dataSource[i].photo == null || that.dataSource[i].photo == undefined || that.dataSource[i].photo == '') {
+ // this.$message.error("绗�" + (i + 1) + "琛岀ず鎰忓浘涓虹┖锛岃涓婁紶")
+ // that.confirmLoading = false
+ // return false;
+ // }
+ // if (that.dataSource[i].location == null || that.dataSource[i].location == undefined || that.dataSource[i].location == '') {
+ // this.$message.error("绗�" + (i + 1) + "琛岄儴浣嶄负绌猴紝璇峰～鍐�")
+ // that.confirmLoading = false
+ // return false;
+ // }
if (that.dataSource[i].maintenanceCycleId == null || that.dataSource[i].maintenanceCycleId == undefined) {
this.$message.error("绗�" + (i + 1) + "琛屽懆鏈熶负绌猴紝璇烽�夋嫨")
that.confirmLoading = false
return false;
}
- if (that.dataSource[i].maintenanceMode == null || that.dataSource[i].maintenanceMode == undefined || that.dataSource[i].maintenanceMode == '') {
- this.$message.error("绗�" + (i + 1) + "琛岀淮淇濇柟寮忎负绌猴紝璇烽�夋嫨")
- that.confirmLoading = false
- return false;
- }
+ // if (that.dataSource[i].maintenanceMode == null || that.dataSource[i].maintenanceMode == undefined || that.dataSource[i].maintenanceMode == '') {
+ // this.$message.error("绗�" + (i + 1) + "琛岀淮淇濇柟寮忎负绌猴紝璇烽�夋嫨")
+ // that.confirmLoading = false
+ // return false;
+ // }
@@ -691,6 +693,14 @@
})
},
+ getSeq() {
+ getAction(this.url.getNum, { type: 'SpecialtyMaintenanceStandard', length: 4 }).then(res => {
+ if (res.success) {
+ this.form.setFieldsValue({ "num": res.result })
+ }
+ })
+ },
+
getMaintenanceCycle() {
getAction(this.url.getMaintenanceCycle).then((res) => {
if (res.success) {
--
Gitblit v1.9.3