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/EquipmentListOfFilesCarousel.vue | 24 ++++++-----
src/views/eam/EquipmentListOfWeldingMachine.vue | 22 ++++++-----
src/views/eam/EquipmentListOfProduct.vue | 22 ++++++-----
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 14 +++++-
src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue | 1
src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue | 2 +
6 files changed, 51 insertions(+), 34 deletions(-)
diff --git a/src/views/eam/EquipmentList.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
similarity index 97%
copy from src/views/eam/EquipmentList.vue
copy to src/views/eam/EquipmentListOfFilesCarousel.vue
index 5b43b6e..cc047d7 100644
--- a/src/views/eam/EquipmentList.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false">
+ <a-card :bordered="false" title="鏁版帶鍥炶浆搴�">
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -10,8 +10,8 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <j-search-select-tag
- dict="mom_eam_equipment_category,name,id"
+ <j-dict-select-tag
+ dict="mom_eam_equipment_category,name,id,equipment_category_uda1 = 'filesCarousel'"
placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
v-model="queryParam.equipmentCategoryId"
/>
@@ -25,10 +25,10 @@
:wrapperCol="wrapperCol"
label="缁熶竴缂栫爜"
>
- <j-input
+ <a-input
placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
v-model="queryParam.num"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
<a-col
@@ -39,10 +39,10 @@
:wrapperCol="wrapperCol"
label="璁惧鍚嶇О"
>
- <j-input
+ <a-input
placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
v-model="queryParam.name"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
<a-col :span="5">
@@ -51,10 +51,10 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <j-input
+ <a-input
v-model="queryParam.model"
placeholder="璇疯緭鍏ュ瀷鍙�"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
<a-col :span="4">
@@ -451,7 +451,7 @@
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
</a-tabs>
- <equipment-modal ref="modalForm" @ok="modalFormOk"></equipment-modal>
+ <equipment-modal ref="modalForm" @ok="modalFormOk" :caytegoryParam="caytegoryParam"></equipment-modal>
<process-edit-model ref ="processEditModel"></process-edit-model>
<precision-edit-model ref ="precisionEditModel"></precision-edit-model>
<aBC-update-edit-model @ok="modalFormOk" :updateList="selectionRows" ref="updateABC"></aBC-update-edit-model>
@@ -489,7 +489,7 @@
EquipmentPrecisionParametersList,
EquipmentModal,
EquipmentResumeDrawer,
- JSearchSelectTag,
+ JSearchSelectTag,
ProcessEditModel,
PrecisionEditModel,
EquipmentUpdateABCList ,
@@ -502,6 +502,7 @@
data () {
return {
description: '璁惧鍙拌处绠＄悊椤甸潰',
+ caytegoryParam:'filesCarousel',
// 琛ㄥご
columns: [
{
@@ -807,6 +808,7 @@
this.ipagination.current = 1;
}
this.onClearSelected()
+ this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
var params = this.getQueryParams();//鏌ヨ鏉′欢
this.loading = true;
getAction(this.url.list, params).then((res) => {
diff --git a/src/views/eam/EquipmentList.vue b/src/views/eam/EquipmentListOfProduct.vue
similarity index 97%
rename from src/views/eam/EquipmentList.vue
rename to src/views/eam/EquipmentListOfProduct.vue
index 5b43b6e..b3fe092 100644
--- a/src/views/eam/EquipmentList.vue
+++ b/src/views/eam/EquipmentListOfProduct.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false">
+ <a-card :bordered="false" title="鐢熶骇璁惧">
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -10,8 +10,8 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <j-search-select-tag
- dict="mom_eam_equipment_category,name,id"
+ <j-dict-select-tag
+ dictCode="mom_eam_equipment_category,name,id,equipment_category_uda1 = 'producter'"
placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
v-model="queryParam.equipmentCategoryId"
/>
@@ -25,10 +25,10 @@
:wrapperCol="wrapperCol"
label="缁熶竴缂栫爜"
>
- <j-input
+ <a-input
placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
v-model="queryParam.num"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
<a-col
@@ -39,10 +39,10 @@
:wrapperCol="wrapperCol"
label="璁惧鍚嶇О"
>
- <j-input
+ <a-input
placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
v-model="queryParam.name"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
<a-col :span="5">
@@ -51,10 +51,10 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <j-input
+ <a-input
v-model="queryParam.model"
placeholder="璇疯緭鍏ュ瀷鍙�"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
<a-col :span="4">
@@ -451,7 +451,7 @@
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
</a-tabs>
- <equipment-modal ref="modalForm" @ok="modalFormOk"></equipment-modal>
+ <equipment-modal ref="modalForm" @ok="modalFormOk" :caytegoryParam="caytegoryParam"></equipment-modal>
<process-edit-model ref ="processEditModel"></process-edit-model>
<precision-edit-model ref ="precisionEditModel"></precision-edit-model>
<aBC-update-edit-model @ok="modalFormOk" :updateList="selectionRows" ref="updateABC"></aBC-update-edit-model>
@@ -502,6 +502,7 @@
data () {
return {
description: '璁惧鍙拌处绠＄悊椤甸潰',
+ caytegoryParam:'producter',
// 琛ㄥご
columns: [
{
@@ -807,6 +808,7 @@
this.ipagination.current = 1;
}
this.onClearSelected()
+ this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
var params = this.getQueryParams();//鏌ヨ鏉′欢
this.loading = true;
getAction(this.url.list, params).then((res) => {
diff --git a/src/views/eam/EquipmentList.vue b/src/views/eam/EquipmentListOfWeldingMachine.vue
similarity index 97%
copy from src/views/eam/EquipmentList.vue
copy to src/views/eam/EquipmentListOfWeldingMachine.vue
index 5b43b6e..48de169 100644
--- a/src/views/eam/EquipmentList.vue
+++ b/src/views/eam/EquipmentListOfWeldingMachine.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false">
+ <a-card :bordered="false" title="鐒婃満">
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -10,8 +10,8 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <j-search-select-tag
- dict="mom_eam_equipment_category,name,id"
+ <j-dict-select-tag
+ dictCode="mom_eam_equipment_category,name,id,equipment_category_uda1 = 'weldingMachine'"
placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
v-model="queryParam.equipmentCategoryId"
/>
@@ -25,10 +25,10 @@
:wrapperCol="wrapperCol"
label="缁熶竴缂栫爜"
>
- <j-input
+ <a-input
placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
v-model="queryParam.num"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
<a-col
@@ -39,10 +39,10 @@
:wrapperCol="wrapperCol"
label="璁惧鍚嶇О"
>
- <j-input
+ <a-input
placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
v-model="queryParam.name"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
<a-col :span="5">
@@ -51,10 +51,10 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <j-input
+ <a-input
v-model="queryParam.model"
placeholder="璇疯緭鍏ュ瀷鍙�"
- ></j-input>
+ ></a-input>
</a-form-item>
</a-col>
<a-col :span="4">
@@ -451,7 +451,7 @@
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
</a-tabs>
- <equipment-modal ref="modalForm" @ok="modalFormOk"></equipment-modal>
+ <equipment-modal ref="modalForm" @ok="modalFormOk" :caytegoryParam="caytegoryParam"></equipment-modal>
<process-edit-model ref ="processEditModel"></process-edit-model>
<precision-edit-model ref ="precisionEditModel"></precision-edit-model>
<aBC-update-edit-model @ok="modalFormOk" :updateList="selectionRows" ref="updateABC"></aBC-update-edit-model>
@@ -502,6 +502,7 @@
data () {
return {
description: '璁惧鍙拌处绠＄悊椤甸潰',
+ caytegoryParam:'weldingMachine',
// 琛ㄥご
columns: [
{
@@ -807,6 +808,7 @@
this.ipagination.current = 1;
}
this.onClearSelected()
+ this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
var params = this.getQueryParams();//鏌ヨ鏉′欢
this.loading = true;
getAction(this.url.list, params).then((res) => {
diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue
index e39d847..f8e4bbe 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue
+++ b/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue
@@ -169,6 +169,7 @@
this.$refs.modalForm.title = "鏂板";
this.$refs.modalForm.disableSubmit = false;
this.$refs.modalForm.parentId = record.id;
+ this.$refs.modalForm.equipmentCategoryUda1 = record.equipmentCategoryUda1;
},
onClearSelected() {
this.hiding = true;
diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
index 65c6c0d..0cba98f 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
+++ b/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
@@ -261,6 +261,7 @@
codeDisable: true,
disableSubmit: false,
parentId: '',
+ equipmentCategoryUda1:'',
model: {},
labelCol: {
span: 7
@@ -470,6 +471,7 @@
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;
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 174b33d..6e9a071 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -32,7 +32,7 @@
placeholder="璇烽�夋嫨璁惧鎵�灞炲垎绫�"
:disabled="formDisabled"
:triggerChange="true"
- dictCode="mom_eam_equipment_category,name,id"
+ :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
v-model="model.equipmentCategoryId"
/>
</a-form-model-item>
@@ -167,7 +167,7 @@
>缁存姢鍙婁娇鐢ㄤ俊鎭�</a-divider>
<a-col :span="6">
<a-form-model-item
- label="缁翠慨閮ㄩ棬"
+ label="缁存姢閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="manageId"
@@ -177,7 +177,7 @@
style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
:tree-data="treeData"
- placeholder="璇烽�夋嫨缁翠慨閮ㄩ棬"
+ placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
tree-default-expand-all
v-model="model.manageId"
/>
@@ -878,6 +878,11 @@
default: false,
required: false
},
+ caytegoryParam:{
+ type:String,
+ default: '',
+ required: false
+ }
},
data() {
return {
@@ -985,6 +990,9 @@
edit(record) {
console.log(this.disabled)
this.model = Object.assign({}, record);
+ if(!this.model.id){
+ this.model.equipmentStatus = '1'
+ }
this.visible = true;
},
close() {
--
Gitblit v1.9.3