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/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue b/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue
index 24ac3de..036d907 100644
--- a/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue
+++ b/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue
@@ -29,12 +29,12 @@
</a-col>
<a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<!-- <a-select
- :placeholder="disableSubmit?'':'璇烽�夋嫨瀵硅薄閮ㄩ棬'"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨浣跨敤閮ㄩ棬'"
:options="this.departs"
style="width: 100%"
:disabled="disableSubmit"
@@ -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'
},
@@ -346,7 +346,7 @@
},
departId: {
rules: [
- { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' },
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
]
},
teamId: {
@@ -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;
// 瑙﹀彂琛ㄥ崟楠岃瘉
--
Gitblit v1.9.3