From 56d9c88deb00626a312bc06a7243f9be14eec1df Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期日, 08 十月 2023 17:30:22 +0800
Subject: [PATCH] 不同类型设备设备台账
---
src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue | 283 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 266 insertions(+), 17 deletions(-)
diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
index b5a207e..0cba98f 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
+++ b/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
@@ -1,7 +1,7 @@
<template>
<a-modal
:title="title"
- :width="1050"
+ :width="1250"
:visible="visible"
:maskClosable="false"
:confirmLoading="confirmLoading"
@@ -14,7 +14,7 @@
<a-spin :spinning="confirmLoading">
<a-form :form="form">
-<!-- <a-row :gutter="24">
+ <!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
label="涓婄骇璁惧鍒嗙被缂栧彿"
@@ -60,7 +60,10 @@
/>
</a-form-item>
</a-col>
- <a-col :span="12">
+ <a-col
+ :span="12"
+ v-if="parentId!='-1'"
+ >
<a-form-item
label="璁惧鍒嗙被鍚嶇О"
:labelCol="labelCol"
@@ -74,13 +77,68 @@
/>
</a-form-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
- <a-col :span="24">
+ <a-col
+ :span="12"
+ v-if="parentId=='-1'"
+ >
<a-form-item
- :labelCol="{span:3}"
- :wrapperCol="{span:21}"
+ label="璁惧鍒嗙被鍚嶇О"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="disableSubmit"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨鍒嗙被鍚嶇О'"
+ :triggerChange="true"
+ dictCode="sys_dict_item,item_text,item_text,dict_id ='1695985281980776449'"
+ v-decorator="['name', validatorRules.name ]"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <!-- <a-row
+ hidden
+ :gutter="24"
+ >
+ <a-col :span="12">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="鍒嗙被鏍囪瘑"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="disableSubmit"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨鍒嗙被鏍囪瘑'"
+ :triggerChange="true"
+ dictCode="equipment_category"
+ v-decorator="['equipmentCategoryUda1', validatorRules.equipmentCategoryUda1]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="鎶�鏈姸鎬侀壌瀹氬懆鏈�"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="disableSubmit"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨鎶�鏈姸鎬侀壌瀹氬懆鏈�'"
+ :triggerChange="true"
+ dictCode="appraisal_cycle"
+ v-decorator="['equipmentCategoryUda2', validatorRules.equipmentCategoryUda2]"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row> -->
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
label="澶囨敞"
>
<a-textarea
@@ -92,8 +150,65 @@
</a-form-item>
</a-col>
</a-row>
-
</a-form>
+ <a-divider
+ v-if="title!='鏂板'"
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #66aeed;"
+ > 閫夋嫨瀛愯澶囧垎绫讳娇鍏惰窡闅忕埗璁惧鍒嗙被灞炴�� </a-divider>
+ <a-tabs
+ type="card"
+ defaultActiveKey="1"
+ v-if="title!='鏂板'"
+ >
+ <a-tab-pane
+ tab='瀛愯澶囧垎绫�'
+ key='1'
+ >
+ <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"
+ bordered
+ size="middle"
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ @change="handleTableChange"
+ :scroll="{ x: true}"
+ >
+ <template
+ slot="num"
+ slot-scope="text"
+ >
+ <a-tooltip
+ placement="top"
+ :title="text"
+ trigger="hover"
+ >
+ <div>
+ <template slot="title"> </template>
+ <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
+ </div>
+ </a-tooltip>
+ </template>
+
+ </a-table>
+
+ </a-tab-pane>
+ </a-tabs>
+
</a-spin>
<template slot="footer">
@@ -103,7 +218,7 @@
>
鍏抽棴
</a-button>
-<!-- <a-button
+ <!-- <a-button
v-if="!this.model.id"
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
@@ -126,9 +241,19 @@
import pick from 'lodash.pick'
import { postAction, requestPut } from '@/api/manage'
import { duplicateCheck } from '@/api/api'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
export default {
name: 'EquipmentCategoryModel',
+ mixins: [JeecgListMixin],
+ props: {
+ mainId: {
+ type: String,
+ default: '',
+ required: false
+ },
+ },
data() {
return {
title: "鎿嶄綔",
@@ -136,14 +261,13 @@
codeDisable: true,
disableSubmit: false,
parentId: '',
+ equipmentCategoryUda1:'',
model: {},
labelCol: {
- xs: { span: 24 },
- sm: { span: 6 },
+ span: 7
},
wrapperCol: {
- xs: { span: 24 },
- sm: { span: 18 },
+ span: 17
},
confirmLoading: false,
form: this.$form.createForm(this),
@@ -162,16 +286,112 @@
{ validator: this.validateName },
]
},
+ equipmentCategoryUda1: {
+ rules: [
+ { required: true, message: '璇烽�夋嫨绫诲埆鏍囪瘑!' },
+ ]
+ },
remark: {
rules: [
{ min: 0, max: 100, message: '闀垮害涓嶈秴杩� 100 涓瓧绗�', trigger: 'blur' },
+ ]
+ },
+ equipmentCategoryUda2: {
+ rules: [
+ { required: true, message: '璇烽�夋嫨鎶�鏈姸鎬侀壌瀹氬懆鏈�!' },
]
}
},
url: {
add: "/eam/equipmentCategory/add",
- edit: "/eam/equipmentCategory/edit"
+ edit: "/eam/equipmentCategory/edit",
+ list: "/eam/equipmentCategory/getAllChildren"
},
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ align: 'center',
+ customRender: function (t, r, index) {
+ return parseInt(index) + 1
+ },
+ width: 50,
+ },
+ /* {
+ title: '涓婄骇璁惧鍒嗙被缂栫爜',
+ align: "center",
+ dataIndex: 'parentNum',
+ customRender:function(text, record){
+ return record.parentName+text;
+ }
+ },
+
+ {
+ title: '涓婄骇璁惧鍒嗙被鍚嶇О',
+ align: "center",
+ dataIndex: 'parentName',
+ }, */
+ {
+ title: '鍒嗙被缂栫爜',
+ align: "center",
+ dataIndex: 'num',
+ scopedSlots: { customRender: 'num' },
+ width: 100,
+ ellipsis: true,
+ // scopedSlots: {
+ // customRender: 'num',
+ // },
+ // sorter: true,
+ },
+ {
+ title: '鍒嗙被鍚嶇О',
+
+ align: "center",
+ dataIndex: 'name',
+
+ // scopedSlots: {
+ // customRender: 'name',
+ // },
+ // sorter: true,
+ },
+ {
+ title: '鍒嗙被鏍囪瘑',
+
+ align: "center",
+ dataIndex: 'equipmentCategoryUda1_dictText',
+ // scopedSlots: {
+ // customRender: 'name',
+ // },
+ // sorter: true,
+
+ },
+ {
+ title: '鍒涘缓浜�',
+ align: "center",
+ dataIndex: 'createBy',
+
+ },
+ {
+ title: '淇敼浜�',
+ align: "center",
+ dataIndex: 'updateBy',
+
+ },
+ {
+ title: '鍒涘缓鏃堕棿',
+ align: "center",
+ dataIndex: 'createTime',
+
+ },
+
+ {
+ title: '淇敼鏃堕棿',
+ align: "center",
+ dataIndex: 'updateTime',
+
+ },
+ ],
//鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴��
alterFlag: ""
}
@@ -190,7 +410,7 @@
this.visible = true;
this.disableSubmit = false;
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'parentNum', 'parentName', 'num', 'name', 'remark'))
+ this.form.setFieldsValue(pick(this.model, 'parentNum', 'equipmentCategoryUda1', 'equipmentCategoryUda2', 'parentName', 'num', 'name', 'remark'))
});
if (record.id) {
this.codeDisable = true;
@@ -202,6 +422,15 @@
close() {
this.$emit('close');
this.visible = false;
+ this.onClearSelected();
+ },
+ onSelectChange(selectedRowKeys, selectionRows) {
+ this.selectedRowKeys = selectedRowKeys;
+ this.selectionRows = selectionRows;
+ },
+ onClearSelected() {
+ this.selectedRowKeys = [];
+ this.selectionRows = [];
},
//淇濆瓨骞舵柊澧炴寜閽Е鍙�
@@ -242,8 +471,10 @@
let obj;
if (!this.model.id) {
formData.parentId = this.parentId
+ formData.equipmentCategoryUda1 = this.equipmentCategoryUda1;
obj = postAction(this.url.add, formData);
} else {
+ formData.equipmentCategoryDtlList = this.selectionRows;
obj = requestPut(this.url.edit, formData, { id: this.model.id });
}
obj.then((res) => {
@@ -256,7 +487,9 @@
}
}).finally(() => {
that.confirmLoading = false;
+ that.$bus.$emit('loadData')
that.close();
+ that.onClearSelected();
})
}
})
@@ -303,12 +536,28 @@
}
})
},
+ clearList() {
+ this.dataSource = []
+ this.selectedRowKeys = []
+ this.ipagination.current = 1
+ }
},
watch: {
alterFlag() {
this.$bus.$emit('queryTreeData');
},
+ mainId: {
+ immediate: true,
+ handler(val) {
+ if (!this.mainId) {
+ this.clearList()
+ } else {
+ this.queryParam['parentId'] = val
+ this.loadData(1);
+ }
+ }
+ },
}
}
</script>
--
Gitblit v1.9.3