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/dailyMaintenanceOrder/MaintenanceOrderModal.vue | 88 ++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 36 deletions(-)
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
index 4cf31ae..d72624a 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>
@@ -112,7 +112,7 @@
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
@@ -298,6 +298,7 @@
rowKey='id'
:columns="columns"
:dataSource="dataSource"
+ :pagination="false"
>
<!-- <span
slot="photo"
@@ -423,37 +424,42 @@
},
width: 50,
},
+ // {
+ // title: '閮ㄤ綅',
+ // align: 'center',
+ // dataIndex: 'location'
+ // },
{
- title: '閮ㄤ綅',
+ title: '淇濆吇瑙掕壊',
align: 'center',
- dataIndex: 'location'
+ dataIndex: 'maintenanceRole'
},
{
- title: '淇濆吇椤圭洰',
+ title: '淇濆吇鍐呭',
align: 'center',
- dataIndex: 'maintenanceProjectNum'
+ dataIndex: 'maintenanceProjectName'
},
- {
- title: '淇濆吇鏍囧噯',
- align: 'center',
- dataIndex: 'standard'
- },
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'maintenanceMethod'
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'maintenanceTool'
- },
- {
- title: '绀烘剰鍥�',
- align: 'center',
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' }
- },
+ // {
+ // title: '淇濆吇鏍囧噯',
+ // align: 'center',
+ // dataIndex: 'standard'
+ // },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'maintenanceMethod'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'maintenanceTool'
+ // },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: 'center',
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' }
+ // },
// {
// title: '缁翠繚涓撲笟',
// align: 'center',
@@ -487,7 +493,7 @@
},
useId: {
rules: [
- { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' },
+ { required: false, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
]
},
maintenanceCycleId: {
@@ -533,6 +539,7 @@
getMaintenanceProjectList: "/eam/dailyMaintenanceOrder/getMaintenanceProjectId",
getSysDeparts: "/eam/dailyMaintenanceOrder/getSysDeparts",
list: "/eam/dailyMaintenanceOrder/getMaintenanceCycleByStandardId",
+ getNum: '/eam/sysIdentity/getNumNew'
},
}
@@ -541,6 +548,7 @@
methods: {
add() {
this.edit({})
+ this.getSeq()
},
edit(record) {
@@ -633,12 +641,12 @@
onSearchMaintenanceStandard() {
let data = this.form.getFieldsValue(['useId']);
- if (data.useId == null || data.useId == "") {
- this.$message.warning("璇峰厛閫夋嫨瀵硅薄閮ㄩ棬!");
- return
- }
+ // if (data.useId == null || data.useId == "") {
+ // this.$message.warning("璇峰厛閫夋嫨浣跨敤閮ㄩ棬!");
+ // return
+ // }
this.$refs.DailyMaintenanceStandardList.list(data.useId);
- this.$refs.DailyMaintenanceStandardList.title = "閫夋嫨鏃ュ父淇濆吇鏍囧噯";
+ this.$refs.DailyMaintenanceStandardList.title = "閫夋嫨浜岀骇淇濆吇鏍囧噯";
},
sendMaintenanceStandardRecord(data) {
let record = data.record;
@@ -669,6 +677,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) => {
--
Gitblit v1.9.3