From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue | 115 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 85 insertions(+), 30 deletions(-)
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
index 7350f8d..f8a4047 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
@@ -29,17 +29,25 @@
</a-col>
<a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <a-input-search
+ <!-- <a-input-search
:disabled="disableSubmit"
placeholder="璇烽�夋嫨瀵硅薄閮ㄩ棬"
enter-button
@search="onDepartList()"
:read-only="true"
v-decorator="['useDepartName', validatorRules.useDepartName]"
+ /> -->
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨閮ㄩ棬"
+ tree-default-expand-all
+ v-decorator="['departId', validatorRules.useId ]"
/>
</a-form-item>
</a-col>
@@ -88,7 +96,7 @@
allow-clear
:disabled="true"
:placeholder="disableSubmit?'':'璇疯緭鍏ヨ矗浠荤彮缁�'"
- v-decorator="['teamName', validatorRules.teamName ]"
+ v-decorator="['teamName', {} ]"
/>
</a-form-item>
</a-col>
@@ -111,7 +119,7 @@
/>
</a-form-item>
</a-col>
- <a-col :span="12">
+ <!-- <a-col :span="12">
<a-form-item
label="瀵硅薄閮ㄩ棬Id"
:labelCol="labelCol"
@@ -124,7 +132,7 @@
v-decorator="['departId', validatorRules.useId ]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="12">
<a-form-item
label="鐝粍Id"
@@ -255,6 +263,7 @@
rowKey='id'
:columns="columns"
:dataSource="dataSource"
+ :pagination="false"
>
<template
v-for="col in columns"
@@ -284,8 +293,9 @@
v-if="col.dataIndex == 'location'"
:maxLength="500"
auto-size
- placeholder="璇疯緭鍏ヤ綅缃�"
+ placeholder="璇疯緭鍏ヤ繚鍏讳綅缃�"
@change="(e)=>handleChange(e, record.key, col, index)"
+ :disabled="true"
/>
<j-image-upload
:value="text"
@@ -296,6 +306,16 @@
@change="(e)=>handleChange(e, record.key, col, index)"
>
</j-image-upload>
+ <j-dict-select-tag
+ v-if="col.dataIndex == 'maintenanceRole'"
+ :value="text"
+ allow-clear
+ :triggerChange="true"
+ dictCode="maintenance_role"
+ placeholder="璇烽�夋嫨淇濆吇瑙掕壊"
+ style="width: 100%"
+ @change="(e)=>handleChange(e, record.key, col, index)"
+ />
</div>
</template>
@@ -442,21 +462,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',
@@ -477,7 +497,7 @@
width: 150,
},
{
- title: '閮ㄤ綅',
+ title: '淇濆吇閮ㄤ綅',
align: 'center',
dataIndex: 'location',
scopedSlots: { customRender: 'location' },
@@ -488,6 +508,13 @@
align: 'center',
dataIndex: 'maintenanceCycleId',
scopedSlots: { customRender: 'maintenanceCycleId' },
+ width: 150,
+ },
+ {
+ title: '淇濆吇瑙掕壊',
+ align: 'center',
+ dataIndex: 'maintenanceRole',
+ scopedSlots: { customRender: 'maintenanceRole' },
width: 150,
},
{
@@ -508,6 +535,7 @@
model: {},
upload: {},
maintenanceCycles: {},
+ treeData: [],
labelCol: {
xs: { span: 24 },
sm: { span: 6 },
@@ -560,10 +588,12 @@
add: "/eam/maintenanceStandard/add",
edit: "/eam/maintenanceStandard/edit",
addDetail: "/eam/maintenanceStandardDetail/add",
- getMaintenanceCycle: "/eam/maintenanceStandardDetail/getMaintenanceCycle",
+ getMaintenanceCycle: "/eam/maintenanceStandardDetail/getPeriodicMaintenanceCycle",
realDelete: "/eam/maintenanceStandardDetail/realDelete",
revise: '/eam/maintenanceStandard/revise',
getReviseVersion: "/eam/maintenanceStandard/getReviseVersion",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
+ getNum: '/eam/sysIdentity/getNumNew'
},
dataSource: [],
@@ -583,6 +613,7 @@
standard: data[i].standard,
maintenanceMethodName: data[i].maintenanceMethod_dictText,
maintenanceTool: data[i].maintenanceTool,
+ location: data[i].location,
maintenanceSpecialtyName: data[i].maintenanceSpecialtyId_dictText,
maintenanceRequire: data[i].maintenanceRequire,
workingHourQuota: data[i].workingHourQuota,
@@ -631,27 +662,27 @@
add() {
this.edit({ maintenanceStandardDetaillist: [] })
+ this.getSeq()
},
edit(record) {
let that = this;
- this.getMaintenanceCycle()
+ this.initOptions();
+ // this.getMaintenanceCycle()
this.dataSource = [];
this.form.resetFields();
this.model = Object.assign({}, record);
this.visible = true;
if (record.maintenanceStandardDetaillist != undefined) {
const temp = [...record.maintenanceStandardDetaillist];
- // for (let i = 0; i < temp.length; i++) {
- // let r = temp[i].upload;
- // r.src = this.getSrc(temp[i].upload);
- // }
that.dataSource = temp;
}
that.$nextTick(() => {
that.form.setFieldsValue(pick(that.model, 'num', 'departId', 'teamId', 'equipmentId', 'equipmentName', 'useDepartName', 'useId', 'teamName', 'assignMode', 'version', 'remark'));
});
if (record.id) {
+ this.maintenanceCycles = []
+ this.getMaintenanceCycle(this.model.equipmentId)
this.codeDisable = true;
that.$nextTick(() => {
if (that.isRevise) {
@@ -670,6 +701,24 @@
}
},
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
+
+ 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']);
if (data.departId == null || data.departId == "") {
@@ -682,7 +731,9 @@
sendEquipmentRecord(data) {
this.dataSource = [];
let record = data.record;
+ this.getMaintenanceCycle(record.id)
this.form.setFieldsValue({ equipmentId: record.id, equipmentName: record.num + "/" + record.name + "/" + record.model, teamId: record.teamId, teamName: record.teamId_dictText });
+
},
onDepartList() {
@@ -764,8 +815,9 @@
})
},
- getMaintenanceCycle() {
- getAction(this.url.getMaintenanceCycle).then((res) => {
+ getMaintenanceCycle(equipmentId) {
+ debugger
+ getAction(this.url.getMaintenanceCycle, { equipmentId: equipmentId }).then((res) => {
if (res.success) {
this.maintenanceCycles = res.result
}
@@ -793,6 +845,9 @@
if (column.dataIndex == 'location') {
target[column.dataIndex] = value.target.value;
}
+ if (column.dataIndex == 'maintenanceRole') {
+ target[column.dataIndex] = value;
+ }
//鏄剧ず甯﹁繃鏉ョ殑鏁版嵁
that.dataSource = temp;
}
--
Gitblit v1.9.3