From ef4e8205a30f83c5478f09182e455528df236e84 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 20 十一月 2023 19:04:28 +0800
Subject: [PATCH] 生产线
---
src/views/eam/EquipmentListOfFilesCarousel.vue | 27
src/views/eam/EquipmentListOfPressureVessel.vue | 27
src/views/eam/EquipmentListOfTester.vue | 29
src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue | 78 +--
src/views/eam/EquipmentListOfProduct.vue | 29
src/views/eam/EquipmentListOfTruck.vue | 27
src/views/eam/EquipmentListOfEnvProEquipment.vue | 29
src/views/eam/EquipmentListOfCrane.vue | 42 -
src/views/eam/EquipmentListOfAll.vue | 31 -
src/views/eam/EquipmentOfLine.vue | 410 +++++++++++++++++
src/views/eam/modules/line/EquipmentOfLineForm.vue | 363 +++++++++++++++
src/views/eam/EquipmentListOfRide.vue | 27
src/views/eam/EquipmentListOfWeldingMachine.vue | 29
src/views/eam/modules/line/EquipmentListOfLine.vue | 200 ++++++++
src/views/eam/modules/line/EquipmentOfLineModal.vue | 75 +++
15 files changed, 1,134 insertions(+), 289 deletions(-)
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index 51e7e03..4992313 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -56,24 +56,8 @@
placeholder="璇疯緭鍏ュ瀷鍙�"
></a-input>
</a-form-item>
- </a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
+ </a-col>
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -477,9 +460,9 @@
import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
- import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
+ import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfCrane.vue b/src/views/eam/EquipmentListOfCrane.vue
index 246b7a3..4508fb3 100644
--- a/src/views/eam/EquipmentListOfCrane.vue
+++ b/src/views/eam/EquipmentListOfCrane.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -57,23 +57,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -90,21 +74,6 @@
/>
</a-form-item>
</a-col>
- <!-- <a-col :span="6">
- <a-form-item
- label="杞﹂棿"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <j-dict-select-tag
- allow-clear
- placeholder="璇烽�夋嫨璧勮溅闂�"
- :triggerChange="true"
- dictCode="mom_base_factory_model,name,id,del_flag!='1'"
- v-model="queryParam.factoryModelId"
- />
- </a-form-item>
- </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -220,7 +189,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +447,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfEnvProEquipment.vue b/src/views/eam/EquipmentListOfEnvProEquipment.vue
index 670aaac..8085d38 100644
--- a/src/views/eam/EquipmentListOfEnvProEquipment.vue
+++ b/src/views/eam/EquipmentListOfEnvProEquipment.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -56,24 +56,8 @@
placeholder="璇疯緭鍏ュ瀷鍙�"
></a-input>
</a-form-item>
- </a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
+ </a-col>
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -482,7 +465,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
index 050faad..eeacfcf 100644
--- a/src/views/eam/EquipmentListOfFilesCarousel.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -57,23 +57,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfPressureVessel.vue b/src/views/eam/EquipmentListOfPressureVessel.vue
index a61b854..56cd8c0 100644
--- a/src/views/eam/EquipmentListOfPressureVessel.vue
+++ b/src/views/eam/EquipmentListOfPressureVessel.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -57,23 +57,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfProduct.vue b/src/views/eam/EquipmentListOfProduct.vue
index ee58a1a..a224421 100644
--- a/src/views/eam/EquipmentListOfProduct.vue
+++ b/src/views/eam/EquipmentListOfProduct.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -56,24 +56,8 @@
placeholder="璇疯緭鍏ュ瀷鍙�"
></a-input>
</a-form-item>
- </a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
+ </a-col>
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfRide.vue b/src/views/eam/EquipmentListOfRide.vue
index c4dd9f7..be47e9c 100644
--- a/src/views/eam/EquipmentListOfRide.vue
+++ b/src/views/eam/EquipmentListOfRide.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -57,23 +57,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfTester.vue b/src/views/eam/EquipmentListOfTester.vue
index cea194a..28d63ed 100644
--- a/src/views/eam/EquipmentListOfTester.vue
+++ b/src/views/eam/EquipmentListOfTester.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -56,24 +56,8 @@
placeholder="璇疯緭鍏ュ瀷鍙�"
></a-input>
</a-form-item>
- </a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
+ </a-col>
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfTruck.vue b/src/views/eam/EquipmentListOfTruck.vue
index 4622452..88fc3c8 100644
--- a/src/views/eam/EquipmentListOfTruck.vue
+++ b/src/views/eam/EquipmentListOfTruck.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -57,23 +57,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfWeldingMachine.vue b/src/views/eam/EquipmentListOfWeldingMachine.vue
index f9f0a3a..89b277d 100644
--- a/src/views/eam/EquipmentListOfWeldingMachine.vue
+++ b/src/views/eam/EquipmentListOfWeldingMachine.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -56,24 +56,8 @@
placeholder="璇疯緭鍏ュ瀷鍙�"
></a-input>
</a-form-item>
- </a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
+ </a-col>
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentOfLine.vue b/src/views/eam/EquipmentOfLine.vue
new file mode 100644
index 0000000..6a33fba
--- /dev/null
+++ b/src/views/eam/EquipmentOfLine.vue
@@ -0,0 +1,410 @@
+<template>
+ <a-card :bordered="false" title="杩愯緭杞�">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col :span="6">
+ <a-form-item
+ label="鍒嗙被"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1='+'\''+caytegoryParam+'\''"
+ placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
+ v-model="queryParam.equipmentCategoryId"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :span="6"
+ >
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="鐢熶骇绾跨紪鍙�"
+ >
+ <a-input
+ placeholder="璇疯緭鍏ョ敓浜х嚎缂栫爜鏌ヨ"
+ v-model="queryParam.num"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :span="6"
+ >
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="鐢熶骇绾垮悕绉�"
+ >
+ <a-input
+ placeholder="璇疯緭鍏ョ敓浜х嚎鍚嶇О鏌ヨ"
+ v-model="queryParam.name"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 鏌ヨ鍖哄煙-END -->
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator">
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ @click="searchReset"
+ icon="reload"
+ >閲嶇疆</a-button>
+ <a-button @click="handleAdd" type="primary" icon="plus" v-has="'equipmentAccount:add&delete&import&Edit'">鏂板</a-button>
+ <!-- <a-button type="primary" icon="download" @click="handleExportXls('璁惧鍙拌处')" v-has="'equipmentAccount:outport'">瀵煎嚭</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import" v-has="'equipmentAccount:add&delete&import&Edit'">瀵煎叆</a-button>
+ </a-upload>
+ <a-button :disabled="selectedRowKeys.length==0" @click="handleUpdateABC" type="primary" icon="font-colors" v-has="'equipmentAccount:add&delete&import&Edit'">ABC鏍囪瘑鍙樻洿</a-button>
+ <a-button :disabled="selectedRowKeys.length==0" @click="handleUpdateWarranty" type="primary" icon="calendar" v-has="'equipmentAccount:add&delete&import&Edit'">璐ㄤ繚鏈熷彉鏇�</a-button> -->
+ </div>
+ <!-- table鍖哄煙-begin -->
+ <div>
+ <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"
+ size="middle"
+ bordered
+ rowKey="id"
+ :scroll="{x:true}"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
+ :customRow="clickThenSelect"
+ @change="handleTableChange">
+
+ <template slot="htmlSlot" slot-scope="text">
+ <div v-html="text"></div>
+ </template>
+ <template slot="imgSlot" slot-scope="text,record">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
+ <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ </template>
+ <template slot="fileSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
+ <a-button
+ v-else
+ :ghost="true"
+ type="primary"
+ icon="download"
+ size="small"
+ @click="downloadFile(text)">
+ 涓嬭浇
+ </a-button>
+ </template>
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
+ <a
+ href="javascript:;"
+ @click='handleDetail(record)'
+ >璇︽儏</a>
+ <a-divider type="vertical" />
+ <a @click="handleEdit(record)" >缂栬緫</a>
+ <a-dropdown>
+ <a class="ant-dropdown-link">
+ 鏇村
+ <a-icon type="down" />
+ </a>
+ <a-menu slot="overlay">
+ <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
+
+ </a-menu-item>
+ <a-menu-item>
+ <a-popconfirm
+ title="纭畾鍒犻櫎鍚�?"
+ @confirm="() => handleDelete(record.id)"
+ v-has="'equipmentAccount:add&delete&import&Edit'"
+ >
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
+ </a-table>
+ </div>
+ <a-tabs defaultActiveKey="1">
+ <a-tab-pane tab="璁惧" key="1" forceRender>
+ <equipment-list-of-line :mainId="selectedMainId"></equipment-list-of-line>
+ </a-tab-pane>
+ </a-tabs>
+ <equipment-of-line-modal ref="modalForm" @ok="modalFormOk" :caytegoryParam="caytegoryParam"></equipment-of-line-modal>
+ </a-card>
+</template>
+
+<script>
+
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import { mixinDevice } from '@/utils/mixin'
+ import { getAction } from '@/api/manage'
+ import '@/assets/less/TableExpand.less'
+ import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
+ import EquipmentOfLineModal from './modules/line/EquipmentOfLineModal.vue'
+ import EquipmentListOfLine from './modules/line/EquipmentListOfLine.vue'
+ export default {
+ name: "EquipmentOfLine",
+ mixins:[JeecgListMixin,mixinDevice],
+ components: {
+ JSearchSelectTag,
+ EquipmentOfLineModal,
+ EquipmentListOfLine,
+ },
+ data () {
+ return {
+ description: '璁惧鍙拌处绠＄悊椤甸潰',
+ caytegoryParam:'line',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ align: 'center',
+ customRender: function (t, r, index) {
+ return parseInt(index) + 1
+ },
+ width: 50,
+ },
+ {
+ title: '鐢熶骇绾跨紪鐮�',
+ align: "center",
+ dataIndex: 'num',
+ },
+ {
+ title: '鐢熶骇绾垮悕绉�',
+ align: "center",
+ dataIndex: 'name',
+ },
+ {
+ title: '璁惧鎬绘暟',
+ align: "center",
+ dataIndex: 'sumOfEquipment',
+ },
+ {
+ title: '鎿嶄綔',
+ align: "center",
+ dataIndex: 'action',
+ scopedSlots: {
+ customRender: 'action',
+ },
+ width: 147,
+ fixed: 'right',
+ },
+ ],
+ url: {
+ list: "/eam/equipment/getEquipmentList",
+ delete: "/eam/equipment/delete",
+ deleteBatch: "/eam/equipment/deleteBatch",
+ active: "/eam/equipment/active",
+ exportXlsUrl: '/eam/equipment/exportXls',
+ importExcelUrl: "/eam/equipment/importExcel",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
+ },
+ dictOptions:{
+ },
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination:{
+ current: 1,
+ pageSize: 5,
+ pageSizeOptions: ['5', '10', '50'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
+ selectedMainId:'',
+ superFieldList:[],
+ equipmentProcessParametersMainId: '',
+ equipmentDocumentMainId: '',
+ equipmentPrecisionParametersMainId: '',
+ precisionParametersTemplateId:'',
+ isOpenPrecision:true,
+ isOpenProcess:true,
+ treeData: [],
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ mainId:'',
+ }
+ },
+ created() {
+ this.getSuperFieldList();
+ this.initOptions();
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ }
+ },
+ methods: {
+ initDictConfig(){
+ },
+ equipmentResumeShow(record) {
+ this.$refs.EquipmentResumeDrawer.visible = true
+ this.$refs.EquipmentResumeDrawer.title = '璁惧灞ュ巻'
+ this.$refs.EquipmentResumeDrawer.handleShow(record)
+ },
+ clickThenSelect(record) {
+ return {
+ on: {
+ click: () => {
+ this.onSelectChange(record.id.split(","), [record]);
+ }
+ }
+ }
+ },
+ onClearSelected() {
+ this.selectedRowKeys = [];
+ this.selectionRows = [];
+ this.selectedMainId=''
+ },
+ onSelectChange(selectedRowKeys, selectionRows) {
+ if(selectedRowKeys.length==1){
+ this.selectedMainId=selectedRowKeys[0]
+ }else{
+ this.selectedMainId=''
+ }
+ this.selectedRowKeys = selectedRowKeys;
+ this.selectionRows = selectionRows;
+ },
+ loadData(arg) {
+ if(!this.url.list){
+ this.$message.error("璇疯缃畊rl.list灞炴��!")
+ return
+ }
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) {
+ 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) => {
+ if (res.success) {
+ this.dataSource = res.result.records;
+ this.ipagination.total = res.result.total;
+ }
+ if(res.code===510){
+ this.$message.warning(res.message)
+ }
+ this.loading = false;
+ })
+ },
+ getSuperFieldList(){
+ let fieldList=[];
+ fieldList.push({type:'string',value:'num',text:'缁熶竴缂栫爜',dictCode:''})
+ fieldList.push({type:'string',value:'name',text:'璁惧鍚嶇О',dictCode:''})
+ fieldList.push({type:'string',value:'model',text:'鍨嬪彿',dictCode:''})
+ fieldList.push({type:'string',value:'specification',text:'瑙勬牸',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentStatus',text:'璁惧鐘舵��',dictCode:''})
+ fieldList.push({type:'string',value:'technologyStatus',text:'technologyStatus',dictCode:''})
+ fieldList.push({type:'string',value:'assetNumber',text:'assetNumber',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentCategoryId',text:'equipmentCategoryId',dictCode:''})
+ fieldList.push({type:'string',value:'specificEquipment',text:'specificEquipment',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentPhoto',text:'equipmentPhoto',dictCode:''})
+ fieldList.push({type:'string',value:'constructorId',text:'璧勪骇鍒堕�犲晢',dictCode:''})
+ fieldList.push({type:'string',value:'supplierId',text:'supplierId',dictCode:''})
+ fieldList.push({type:'string',value:'factoryNumber',text:'factoryNumber',dictCode:''})
+ fieldList.push({type:'string',value:'leaveFactoryDate',text:'鍑哄巶鏃ユ湡',dictCode:''})
+ fieldList.push({type:'string',value:'acceptanceCheckDate',text:'楠屾敹鏃ユ湡',dictCode:''})
+ fieldList.push({type:'string',value:'affiliationId',text:'affiliationId',dictCode:''})
+ fieldList.push({type:'string',value:'manageId',text:'缁存姢閮ㄩ棬ID',dictCode:''})
+ fieldList.push({type:'string',value:'manager',text:'manager',dictCode:''})
+ fieldList.push({type:'string',value:'useId',text:'浣跨敤閮ㄩ棬ID',dictCode:''})
+ fieldList.push({type:'string',value:'functionary',text:'functionary',dictCode:''})
+ fieldList.push({type:'string',value:'location',text:'location',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentImportanceId',text:'ABC鏍囪瘑ID',dictCode:''})
+ fieldList.push({type:'string',value:'processParameters',text:'processParameters',dictCode:''})
+ fieldList.push({type:'string',value:'processParametersTemplateId',text:'processParametersTemplateId',dictCode:''})
+ fieldList.push({type:'string',value:'precisionParameters',text:'precisionParameters',dictCode:''})
+ fieldList.push({type:'string',value:'precisionParametersTemplateId',text:'precisionParametersTemplateId',dictCode:''})
+ fieldList.push({type:'string',value:'verification',text:'verification',dictCode:''})
+ fieldList.push({type:'string',value:'verificationPeriod',text:'verificationPeriod',dictCode:''})
+ fieldList.push({type:'string',value:'lastVerificationDate',text:'lastVerificationDate',dictCode:''})
+ fieldList.push({type:'string',value:'nextVerificationDate',text:'nextVerificationDate',dictCode:''})
+ fieldList.push({type:'string',value:'status',text:'status',dictCode:''})
+ fieldList.push({type:'string',value:'remark',text:'remark',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentUda1',text:'宸ュ尯',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentUda2',text:'瀹夎浣嶇疆',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentUda3',text:'閲嶉噺',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentUda4',text:'閲嶉噺璁￠噺鍗曚綅ID',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentUda5',text:'鍔熻兘浣嶇疆',dictCode:''})
+ fieldList.push({type:'string',value:'tenantId',text:'tenantId',dictCode:''})
+ fieldList.push({type:'int',value:'delFlag',text:'delFlag',dictCode:''})
+ fieldList.push({type:'string',value:'teamId',text:'缁翠慨鐝粍ID',dictCode:''})
+ fieldList.push({type:'string',value:'sourceId',text:'sourceId',dictCode:''})
+ fieldList.push({type:'string',value:'fundSource',text:'璧勯噾鏉ユ簮',dictCode:''})
+ fieldList.push({type:'string',value:'factoryNo',text:'鍑哄巶缂栧彿',dictCode:''})
+ fieldList.push({type:'string',value:'mfr',text:'鍒堕�犲晢',dictCode:''})
+ fieldList.push({type:'string',value:'sourceCountry',text:'璧勪骇鏉ユ簮鍥藉',dictCode:''})
+ fieldList.push({type:'string',value:'gpo',text:'鎬诲姛鐜�',dictCode:''})
+ fieldList.push({type:'string',value:'keyEquipmentIdentification',text:'鍏抽敭璁惧鏍囪瘑',dictCode:''})
+ fieldList.push({type:'string',value:'securityConfiguration',text:'瀹夊叏閰嶇疆',dictCode:''})
+ fieldList.push({type:'string',value:'coolingSystem',text:'鍐峰嵈绯荤粺',dictCode:''})
+ fieldList.push({type:'string',value:'fireExtinguisher',text:'鐏伀鍣�',dictCode:''})
+ fieldList.push({type:'string',value:'fireExtinguisherValidityPeriod',text:'鐏伀鍣ㄦ湁鏁堟湡',dictCode:''})
+ fieldList.push({type:'string',value:'operatingSystem',text:'鎿嶄綔绯荤粺',dictCode:''})
+ fieldList.push({type:'string',value:'system',text:'绯荤粺',dictCode:''})
+ fieldList.push({type:'string',value:'port',text:'绔彛',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'coordinateNum',text:'鍧愭爣鏁伴噺',dictCode:''})
+ fieldList.push({type:'string',value:'projectApprovalNo',text:'绔嬮」鍗″彿',dictCode:''})
+ this.superFieldList = fieldList
+ },
+ editProcess(record){
+ this.$refs.processEditModel.edit(record);
+ },
+ editPrecision(record){
+ this.$refs.precisionEditModel.edit(record);
+ },
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
+ handleUpdateABC(){
+ this.$refs.updateABC.add();
+ },
+ handleUpdateWarranty(){
+ this.$refs.updateWarranty.add();
+ },
+ handleEditSpareParts(record){
+ this.$refs.modalFormSpareParts.edit(record);
+ }
+
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less'
+</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue b/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
index fc3fb96..2cf2f80 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
@@ -8,7 +8,7 @@
@cancel="close"
style="top:50px"
cancelText="鍏抽棴"
- :width="1200"
+ :width="1400"
>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
@@ -32,10 +32,10 @@
:md="8"
:sm="6"
>
- <a-form-item label="缁熶竴缂栫爜">
+ <a-form-item label="璁惧鍚嶇О">
<a-input
- placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
- v-model="queryParam.num"
+ placeholder="璁惧鍚嶇О"
+ v-model="queryParam.name"
/>
</a-form-item>
</a-col>
@@ -108,69 +108,51 @@
{
title: '缁熶竴缂栫爜',
align: 'center',
- dataIndex: 'num'
- },
- {
- title: '璧勪骇缂栫爜',
- align: 'center',
- dataIndex: 'assetNumber'
- },
-
- {
- title: '鐗圭璁惧',
- align: 'center',
- dataIndex: 'specificEquipment_dictText'
+ dataIndex: 'num',
+ width:200
},
{
title: '璁惧鍚嶇О',
align: 'center',
- dataIndex: 'name'
+ dataIndex: 'name',
+ width:200
},
{
title: '璁惧鍨嬪彿',
align: 'center',
- dataIndex: 'model'
+ dataIndex: 'model',
+ width:200
},
{
title: '璁惧瑙勬牸',
align: 'center',
- dataIndex: 'specification'
+ dataIndex: 'specification',
+ width:200
+ },
+ {
+ title: 'ABC鏍囪瘑',
+ align: "center",
+ dataIndex: 'equipmentImportanceId',
+ width:100
+ },
+ {
+ title: '鍏抽敭璁惧鏍囪瘑',
+ align: "center",
+ dataIndex: 'specificEquipment_dictText',
+ width:100
},
{
title: '璁惧鐘舵��',
align: 'center',
- dataIndex: 'equipmentStatus_dictText'
+ dataIndex: 'equipmentStatus_dictText',
+ width:100
},
{
title: '鎶�鏈姸鎬�',
align: 'center',
- dataIndex: 'technologyStatus_dictText'
+ dataIndex: 'technologyStatus_dictText',
+ width:100
},
-
- {
- title: '璁惧鍥剧墖',
- align: 'center',
- dataIndex: 'equipmentPhoto',
- scopedSlots: { customRender: 'equipmentPhoto' }
- },
- // {
- // title:'璁惧鍥剧墖',
- // align:"center",
- // dataIndex: 'equipmentPhoto',
- // scopedSlots: {customRender: 'imgSlot'}
- // },
- {
- title: '浣嶇疆',
- align: 'center',
- dataIndex: 'location'
- },
-
- {
- title: '閲嶈搴�',
- align: 'center',
- dataIndex: 'equipmentImportanceId_dictText'
- }
-
],
selectedRowKeys: [],
oldSelectRows: [],
@@ -227,7 +209,7 @@
let that = this
this.loading = true
let params = this.getQueryParams()//鏌ヨ鏉′欢
- params.equipmentStatus = '1'
+ // params.equipmentStatus = '1'
await getAction(this.url.list, params).then((res) => {
if (res.success) {
for (let i = 0; i < res.result.records.length; i++) {
@@ -291,7 +273,7 @@
this.loadData()
},
handleSubmit() {
- this.$bus.$emit('selectionRows', this.selectionRows)
+ this.$emit('selectionRows', this.selectionRows)
this.searchReset(0)
this.close()
},
diff --git a/src/views/eam/modules/line/EquipmentListOfLine.vue b/src/views/eam/modules/line/EquipmentListOfLine.vue
new file mode 100644
index 0000000..b485b2f
--- /dev/null
+++ b/src/views/eam/modules/line/EquipmentListOfLine.vue
@@ -0,0 +1,200 @@
+<template>
+ <a-card :bordered="false" :class="'cust-erp-sub-tab'">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ </a-row>
+ </a-form>
+ </div>
+ <div>
+ <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"
+ size="middle"
+ bordered
+ class="j-table-force-nowrap"
+ rowKey="id"
+ :scroll="{x:true}"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ :rowClassName="tableRowClass"
+ @change="handleTableChange">
+ <span
+ slot="specificEquipment"
+ slot-scope="text"
+ >
+ <a-icon type="check" style="color: rgb(0, 21, 255);" v-if="text==='鏄�'" />
+ <a-icon type="close" v-else style="color:red;"/>
+ </span>
+ <template slot="htmlSlot" slot-scope="text">
+ <div v-html="text"></div>
+ </template>
+ <template slot="imgSlot" slot-scope="text,record">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
+ <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ </template>
+ <template slot="fileSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
+ <a-button
+ v-else
+ :ghost="true"
+ type="primary"
+ icon="download"
+ size="small"
+ @click="downloadFile(text)">
+ 涓嬭浇
+ </a-button>
+ </template>
+
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">缂栬緫</a>
+ <a-divider type="vertical" />
+ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </span>
+
+ </a-table>
+ </div>
+ </a-card>
+</template>
+
+<script>
+
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ export default {
+ name: "EquipmentListOfLine",
+ disableMixinCreated:true,
+ mixins:[JeecgListMixin],
+ components: { },
+ props:{
+ mainId:{
+ type:String,
+ default:'',
+ required:false
+ }
+ },
+ watch:{
+ mainId:{
+ immediate: true,
+ handler(val) {
+ if(!this.mainId){
+ this.clearList()
+ }else{
+ this.queryParam['lineId'] = val
+ this.loadData(1);
+ }
+ }
+ }
+ },
+ data () {
+ return {
+ description: '璁惧',
+ disableMixinCreated:true,
+ // 琛ㄥご
+ columns: [
+ {
+ title: '涓昏澶�?',
+ align: "center",
+ dataIndex: 'isMeta_dictText',
+ width:50,
+ scopedSlots: { customRender: 'specificEquipment' }
+ },
+ {
+ title: '璁惧绫诲瀷',
+ align: "center",
+ dataIndex: 'equipmentCategoryId_dictText',
+ width:200
+ },
+ {
+ title: '缁熶竴缂栧彿',
+ align: "center",
+ dataIndex: 'num',
+ width:200
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: "center",
+ dataIndex: 'name',
+ width:200
+ },
+ {
+ title: '鍨嬪彿',
+ align: "center",
+ dataIndex: 'model',
+ width:200
+ },
+ {
+ title: '浣跨敤閮ㄩ棬',
+ align: "center",
+ dataIndex: 'useId_dictText',
+ width:200
+ },
+ {
+ title: 'ABC鏍囪瘑',
+ align: "center",
+ dataIndex: 'equipmentImportanceId',
+ width:100
+ },
+ {
+ title: '鍏抽敭璁惧',
+ align: "center",
+ dataIndex: 'specificEquipment_dictText',
+ width:100
+ },
+ {
+ title: '鎶�鏈姸鎬�',
+ align: "center",
+ dataIndex: 'technologyStatus_dictText',
+ width:100
+ },
+ ],
+ url: {
+ list: "/eam/equipment/getEquipmentList",
+ },
+ dictOptions:{
+ }
+ }
+ },
+ created() {
+ },
+ computed: {
+ importExcelUrl(){
+ return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
+ }
+ },
+ methods: {
+ clearList(){
+ this.dataSource=[]
+ this.selectedRowKeys=[]
+ this.ipagination.current = 1
+ },
+ tableRowClass(record, index) {
+ if (record.isMeta==='yes') {
+ return 'primary'
+ }
+ },
+
+ },
+ mounted(){
+ this.$bus.$on('loadData', (data) => {
+ this.loadData();
+ });
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less';
+ .primary {
+ color: red;
+ font-weight: bold;
+}
+</style>
diff --git a/src/views/eam/modules/line/EquipmentOfLineForm.vue b/src/views/eam/modules/line/EquipmentOfLineForm.vue
new file mode 100644
index 0000000..fcbd6a2
--- /dev/null
+++ b/src/views/eam/modules/line/EquipmentOfLineForm.vue
@@ -0,0 +1,363 @@
+<template>
+ <a-spin :spinning="confirmLoading">
+ <j-form-container :disabled="formDisabled">
+ <!-- 涓昏〃鍗曞尯鍩� -->
+ <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+ <a-row>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鐢熶骇绾挎墍灞炲垎绫�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="equipmentCategoryId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="鐢熶骇绾挎墍灞炲垎绫�"
+ :disabled="formDisabled"
+ :triggerChange="true"
+ :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
+ v-model="model.equipmentCategoryId"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鐢熶骇绾跨紪鐮�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="num"
+ >
+ <a-input
+ v-model="model.num"
+ placeholder="璇疯緭鍏ョ敓浜х嚎缂栧彿"
+ :disabled="formDisabled"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鐢熶骇绾垮悕绉�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="name"
+ >
+ <a-input
+ v-model="model.name"
+ placeholder="璇疯緭鍏ョ敓浜х嚎鍚嶇О"
+ :disabled="formDisabled"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </j-form-container>
+ <!-- 瀛愯〃鍗曞尯鍩� -->
+ <a-tabs v-model="activeKey" @change="handleChangeTabs">
+ <a-tab-pane tab="璁惧" :key="refKeys[0]" :forceRender="true">
+ <j-vxe-table
+ keep-source
+ :ref="refKeys[0]"
+ :loading="equipmentOfLineList.loading"
+ :columns="equipmentOfLineList.columns"
+ :dataSource="equipmentOfLineList.dataSource"
+ :maxHeight="600"
+ :disabled="formDisabled"
+ :rowNumber="true"
+ :rowSelection="true"
+ :bordered="true"
+ :alwaysEdit="true"
+ :toolbar="true"
+ @valueChange="changeDate"
+ :toolbarConfig="toolbarConfig"
+ >
+ <template slot="toolbarPrefix">
+ <a-button type="primary" @click="selectEquipmentList" :disabled="formDisabled">閫夋嫨璁惧
+ </a-button>
+ </template>
+ </j-vxe-table>
+ </a-tab-pane>
+ </a-tabs>
+ <equipment-select-modal ref="EquipmentSelectModal" @selectionRows="addSelectedEquipments"></equipment-select-modal>
+ </a-spin>
+</template>
+
+<script>
+
+ import { getAction } from '@/api/manage'
+ import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
+ import { duplicateCheck } from '@/api/api'
+ import { JVXETypes } from '@/components/jeecg/JVxeTable'
+ import { validateDuplicateValue } from '@/utils/util'
+ import { getRefPromise,VALIDATE_FAILED} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
+ import JFormContainer from '@/components/jeecg/JFormContainer'
+ import EquipmentSelectModal from '../equipmentScrap/EquipmentSelectModal.vue'
+
+ import dayjs from 'dayjs'
+ export default {
+ name: 'EquipmentOfLineForm',
+ mixins: [JVxeTableModelMixin],
+ components: {
+ JFormContainer,
+ dayjs,
+ EquipmentSelectModal
+ },
+ props: {
+ //琛ㄥ崟绂佺敤
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: false
+ },
+ caytegoryParam: {
+ type: String,
+ default: '',
+ required: false
+ }
+ },
+ data() {
+ return {
+ toolbarConfig: {
+ // prefix 鍓嶇紑锛泂uffix 鍚庣紑
+ slot: ['prefix', 'suffix'],
+ // add 鏂板鎸夐挳锛況emove 鍒犻櫎鎸夐挳锛沜learSelection 娓呯┖閫夋嫨鎸夐挳
+ btn: ['remove', 'clearSelection']
+ },
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ model:{
+ },
+ // 鏂板鏃跺瓙琛ㄩ粯璁ゆ坊鍔犲嚑琛岀┖鏁版嵁
+ addDefaultRowNum: 0,
+ validatorRules: {
+ num: [
+ { required: true, message: '璇疯緭鍏ョ紪鐮�!' },
+ { validator: (rule, value, callback) => validateDuplicateValue('mom_eam_equipment', 'num', value, this.model.id, callback) }
+ ],
+ name: [
+ { required: true, message: '璇疯緭鍏ュ悕绉�!' }
+ ],
+ equipmentCategoryId:[
+ { required: true, message: '璇疯緭鍏ュ垎绫�!' }
+ ]
+ },
+ refKeys: ['equipmentOfLineTable', ],
+ tableKeys:['equipmentOfLineTable', ],
+ activeKey: 'equipmentOfLineTable',
+ equipmentOfLineList: {
+ loading: false,
+ dataSource: [],
+ columns: [
+ {
+ title: 'id',
+ key: 'id',
+ type: JVXETypes.hidden,
+ disabled:true,
+ align:'center',
+ },
+ {
+ title: 'showId',
+ key: 'showId',
+ type: JVXETypes.hidden,
+ disabled:true,
+ align:'center',
+ },
+ {
+ title: '缁熶竴缂栫爜',
+ key: 'num',
+ type: JVXETypes.normal,
+ width:"300px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: '璁惧鍚嶇О',
+ key: 'name',
+ type: JVXETypes.normal,
+ width:"300px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: '璁惧鍨嬪彿',
+ key: 'model',
+ type: JVXETypes.normal,
+ width:"202px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: '鍏抽敭璁惧鏍囪瘑',
+ key: 'specificEquipment_dictText',
+ type: JVXETypes.normal,
+ width:"202px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: 'ABC鏍囪瘑',
+ key: 'equipmentImportanceId',
+ type: JVXETypes.normal,
+ width:"202px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: '鎶�鏈姸鎬�',
+ key: 'technologyStatus_dictText',
+ type: JVXETypes.normal,
+ width:"202px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: '鏄惁涓昏澶�',
+ key: 'isMeta',
+ type: JVXETypes.select,
+ width:"202px",
+ placeholder: '璇烽�夋嫨${title}',
+ dictCode:'is_product',
+ align:'center',
+ options:[],
+ validateRules: [
+ {
+ required: true, // 蹇呭～
+ message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ },
+ ]
+ },
+ ]
+ },
+ url: {
+ add: "/eam/equipment/addLine",
+ edit:"/eam/equipment/editLine",
+ equipmentOfLineTable: {
+ list: "/eam/equipment/getEquipmentList",
+ },
+ }
+ }
+ },
+ computed: {
+ formDisabled(){
+ return this.disabled
+ },
+ },
+ created () {
+ },
+ methods: {
+ addBefore(){
+ this.equipmentOfLineList.dataSource=[];
+ },
+ getAllTable() {
+ let values = this.tableKeys.map(key => getRefPromise(this, key))
+ return Promise.all(values)
+ },
+ /** 璋冪敤瀹宔dit()鏂规硶涔嬪悗浼氳嚜鍔ㄨ皟鐢ㄦ鏂规硶 */
+ editAfter() {
+ this.$nextTick(() => {
+ })
+ // 鍔犺浇瀛愯〃鏁版嵁
+ if (this.model.id) {
+ let params = {lineId: this.model.id }
+ this.requestSubTableData(this.url.equipmentOfLineTable.list, params, this.equipmentOfLineList)
+ }
+ },
+ //鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
+ validateSubForm(allValues){
+ return new Promise((resolve,reject)=>{
+ Promise.all([
+ ]).then(() => {
+ resolve(allValues)
+ }).catch(e => {
+ if (e.error === VALIDATE_FAILED) {
+ // 濡傛灉鏈夋湭閫氳繃琛ㄥ崟楠岃瘉鐨勫瓙琛紝灏辫嚜鍔ㄨ烦杞埌瀹冩墍鍦ㄧ殑tab
+ this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
+ } else {
+ console.error(e)
+ }
+ })
+ })
+ },
+ /** 鏁寸悊鎴恌ormData */
+ classifyIntoFormData(allValues) {
+ let main = Object.assign(this.model, allValues.formValue)
+ return {
+ ...main, // 灞曞紑
+ equipmentOfLineTable: allValues.tablesValue[0].tableData,
+ }
+ },
+ validateError(msg){
+ this.$message.error(msg)
+ },
+ changeDate(target){
+ let tableData =this.$refs.equipmentOfLineTable.getTableData();
+ let id = target.row.id
+ if(target.column.key==='isMeta'){
+ for(var i = 0;i<tableData.length;i++){
+ if(id!==tableData[i].showId){
+ this.$refs.equipmentOfLineTable.getRowById(tableData[i].showId).isMeta='no'
+ }
+ }
+ }
+ },
+ //閫夋嫨璁惧
+ selectEquipmentList() {
+ let ids = []
+ let tableData = this.$refs.equipmentOfLineTable.getTableData()
+ let deleteData = this.$refs.equipmentOfLineTable.getDeleteData()
+ for (let i = 0; i < tableData.length; i++) {
+ ids.push(tableData[i].showId)
+ }
+ this.$refs.EquipmentSelectModal.showModals(ids)
+ this.$refs.EquipmentSelectModal.title = '閫夋嫨璁惧'
+ this.$refs.EquipmentSelectModal.disableSubmit = false
+ },
+ addSelectedEquipments(data) {
+ let tableData = this.$refs.equipmentOfLineTable.getTableData()
+ // const seletedEquipmentIds = tableData.
+ var tableStr = JSON.stringify(tableData)
+ const addRows = []
+ for (let i = 0; i < data.length; i++) {
+ var equipment = {}
+ if (tableStr.indexOf(data[i].id)==-1) {
+ equipment = {
+ id: data[i].id,
+ num: data[i].num,
+ name: data[i].name,
+ model:data[i].model,
+ showId:data[i].id,
+ specificEquipment_dictText:data[i].specificEquipment_dictText,
+ technologyStatus_dictText:data[i].technologyStatus_dictText,
+ equipmentImportanceId:data[i].equipmentImportanceId,
+ isMeta:'no'
+ }
+ }
+ addRows.push(equipment)
+ }
+ this.$refs.equipmentOfLineTable.pushRows(addRows)
+ },
+
+ }
+ }
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/line/EquipmentOfLineModal.vue b/src/views/eam/modules/line/EquipmentOfLineModal.vue
new file mode 100644
index 0000000..151d8c5
--- /dev/null
+++ b/src/views/eam/modules/line/EquipmentOfLineModal.vue
@@ -0,0 +1,75 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="1520"
+ :height="600"
+ :visible="visible"
+ :maskClosable="true"
+ :fullscreen="true"
+ switchFullscreen
+ @ok="handleOk"
+ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+ @cancel="handleCancel">
+ <equipment-of-line-form
+ :caytegoryParam="caytegoryParam"
+ ref="realForm"
+ @ok="submitCallback"
+ :disabled="disableSubmit"/>
+ </j-modal>
+</template>
+<script>
+import EquipmentOfLineForm from './EquipmentOfLineForm'
+ export default {
+ name: 'EquipmentOfLineModal',
+ components: {
+ EquipmentOfLineForm
+ },
+ props:{
+ caytegoryParam: {
+ type: String,
+ default: '',
+ required: false
+ }
+ },
+ data() {
+ return {
+ title:'',
+ width:1500,
+ visible: false,
+ disableSubmit: false
+ }
+ },
+ methods:{
+ add () {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.addBefore();
+ })
+ },
+ edit (record) {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(record);
+ })
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ this.$refs.realForm.handleOk();
+ },
+ submitCallback(){
+ this.$emit('ok');
+ this.$bus.$emit('loadData')
+ this.visible = false;
+ },
+ handleCancel () {
+ this.close()
+ }
+ }
+ }
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3