From fd6e935f391501358357f3e6bc1957764510b8bc Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 16:47:05 +0800
Subject: [PATCH] 修改
---
src/views/eam/QuanlityConfirmList.vue | 2
src/views/eam/EquipmentListOfFilesCarousel.vue | 20 ++
src/views/eam/EquipmentListOfPressureVessel.vue | 20 ++
src/views/eam/EquipmentListOfTester.vue | 20 ++
src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue | 3
src/views/eam/EquipmentListOfProduct.vue | 20 ++
src/views/eam/RepairOrderList.vue | 2
src/views/eam/EquipmentListOfTruck.vue | 20 ++
src/views/eam/EquipmentListOfEnvProEquipment.vue | 20 ++
src/views/eam/EquipmentListOfCrane.vue | 20 ++
src/views/eam/EquipmentListOfAll.vue | 22 +++
src/views/eam/EquipmentOfLine.vue | 41 ++++-
src/views/eam/modules/line/EquipmentOfLineForm.vue | 98 +++++++++++++
src/views/eam/modules/malfunctionRepair/FaultDescriptionList.vue | 2
src/views/eam/EquipmentListOfRide.vue | 20 ++
src/views/eam/EquipmentListOfWeldingMachine.vue | 20 ++
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 37 +++++
src/views/eam/modules/malfunctionRepair/AcceptModel.vue | 1
src/views/eam/FaultInfoList.vue | 4
src/views/eam/MalfunctionRepair.vue | 2
20 files changed, 375 insertions(+), 19 deletions(-)
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index d6c2606..c7c8404 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -121,6 +121,21 @@
/>
</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="is_product"
+ v-model="queryParam.isLineEquip"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="6">
@@ -236,7 +251,7 @@
<a-table
ref="table"
- size="middle"
+ size="small"
bordered
rowKey="id"
:scroll="{x:true}"
@@ -523,6 +538,11 @@
dataIndex: 'equipmentCategoryId_dictText',
},
{
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
+ },
+ {
title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'num',
diff --git a/src/views/eam/EquipmentListOfCrane.vue b/src/views/eam/EquipmentListOfCrane.vue
index 0088eda..5839b70 100644
--- a/src/views/eam/EquipmentListOfCrane.vue
+++ b/src/views/eam/EquipmentListOfCrane.vue
@@ -106,6 +106,21 @@
/>
</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="is_product"
+ v-model="queryParam.isLineEquip"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="6">
@@ -508,6 +523,11 @@
dataIndex: 'equipmentCategoryId_dictText',
},
{
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
+ },
+ {
title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'num',
diff --git a/src/views/eam/EquipmentListOfEnvProEquipment.vue b/src/views/eam/EquipmentListOfEnvProEquipment.vue
index c3e12a8..7832d39 100644
--- a/src/views/eam/EquipmentListOfEnvProEquipment.vue
+++ b/src/views/eam/EquipmentListOfEnvProEquipment.vue
@@ -121,6 +121,21 @@
/>
</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="is_product"
+ v-model="queryParam.isLineEquip"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="6">
@@ -525,6 +540,11 @@
align: "center",
dataIndex: 'equipmentCategoryId_dictText',
},
+ {
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
+ },
{
title: '缁熶竴缂栫爜',
align: "center",
diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
index 9b87068..b6cac7d 100644
--- a/src/views/eam/EquipmentListOfFilesCarousel.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -121,6 +121,21 @@
/>
</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="is_product"
+ v-model="queryParam.isLineEquip"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="6">
@@ -523,6 +538,11 @@
dataIndex: 'equipmentCategoryId_dictText',
},
{
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
+ },
+ {
title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'num',
diff --git a/src/views/eam/EquipmentListOfPressureVessel.vue b/src/views/eam/EquipmentListOfPressureVessel.vue
index 9666751..b8812cc 100644
--- a/src/views/eam/EquipmentListOfPressureVessel.vue
+++ b/src/views/eam/EquipmentListOfPressureVessel.vue
@@ -121,6 +121,21 @@
/>
</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="is_product"
+ v-model="queryParam.isLineEquip"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="6">
@@ -523,6 +538,11 @@
dataIndex: 'equipmentCategoryId_dictText',
},
{
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
+ },
+ {
title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'num',
diff --git a/src/views/eam/EquipmentListOfProduct.vue b/src/views/eam/EquipmentListOfProduct.vue
index 67641e2..a9885a2 100644
--- a/src/views/eam/EquipmentListOfProduct.vue
+++ b/src/views/eam/EquipmentListOfProduct.vue
@@ -121,6 +121,21 @@
/>
</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="is_product"
+ v-model="queryParam.isLineEquip"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="6">
@@ -523,6 +538,11 @@
dataIndex: 'equipmentCategoryId_dictText',
},
{
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
+ },
+ {
title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'num',
diff --git a/src/views/eam/EquipmentListOfRide.vue b/src/views/eam/EquipmentListOfRide.vue
index a24c40d..edede79 100644
--- a/src/views/eam/EquipmentListOfRide.vue
+++ b/src/views/eam/EquipmentListOfRide.vue
@@ -121,6 +121,21 @@
/>
</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="is_product"
+ v-model="queryParam.isLineEquip"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="6">
@@ -523,6 +538,11 @@
dataIndex: 'equipmentCategoryId_dictText',
},
{
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
+ },
+ {
title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'num',
diff --git a/src/views/eam/EquipmentListOfTester.vue b/src/views/eam/EquipmentListOfTester.vue
index 370079e..8b39870 100644
--- a/src/views/eam/EquipmentListOfTester.vue
+++ b/src/views/eam/EquipmentListOfTester.vue
@@ -121,6 +121,21 @@
/>
</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="is_product"
+ v-model="queryParam.isLineEquip"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="6">
@@ -523,6 +538,11 @@
dataIndex: 'equipmentCategoryId_dictText',
},
{
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
+ },
+ {
title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'num',
diff --git a/src/views/eam/EquipmentListOfTruck.vue b/src/views/eam/EquipmentListOfTruck.vue
index a04453b..8ca0d29 100644
--- a/src/views/eam/EquipmentListOfTruck.vue
+++ b/src/views/eam/EquipmentListOfTruck.vue
@@ -121,6 +121,21 @@
/>
</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="is_product"
+ v-model="queryParam.isLineEquip"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="6">
@@ -523,6 +538,11 @@
dataIndex: 'equipmentCategoryId_dictText',
},
{
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
+ },
+ {
title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'num',
diff --git a/src/views/eam/EquipmentListOfWeldingMachine.vue b/src/views/eam/EquipmentListOfWeldingMachine.vue
index ca41240..d5cae4a 100644
--- a/src/views/eam/EquipmentListOfWeldingMachine.vue
+++ b/src/views/eam/EquipmentListOfWeldingMachine.vue
@@ -121,6 +121,21 @@
/>
</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="is_product"
+ v-model="queryParam.isLineEquip"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="6">
@@ -523,6 +538,11 @@
dataIndex: 'equipmentCategoryId_dictText',
},
{
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
+ },
+ {
title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'num',
diff --git a/src/views/eam/EquipmentOfLine.vue b/src/views/eam/EquipmentOfLine.vue
index 6a33fba..3335ca5 100644
--- a/src/views/eam/EquipmentOfLine.vue
+++ b/src/views/eam/EquipmentOfLine.vue
@@ -61,7 +61,7 @@
@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 @click="handleAdd" type="primary" icon="plus" v-has="'line:add&edit&delete'">鏂板</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>
@@ -78,7 +78,7 @@
<a-table
ref="table"
- size="middle"
+ size="small"
bordered
rowKey="id"
:scroll="{x:true}"
@@ -119,20 +119,21 @@
>璇︽儏</a>
<a-divider type="vertical" />
<a @click="handleEdit(record)" >缂栬緫</a>
+ <a-divider type="vertical" />
<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 v-has="'line:add&edit&delete'">
</a-menu-item>
<a-menu-item>
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
- v-has="'equipmentAccount:add&delete&import&Edit'"
+ v-has="'line:add&edit&delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
@@ -159,7 +160,7 @@
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'
+ import EquipmentListOfLine from './modules/line/EquipmentListOfLine'
export default {
name: "EquipmentOfLine",
mixins:[JeecgListMixin,mixinDevice],
@@ -188,16 +189,43 @@
title: '鐢熶骇绾跨紪鐮�',
align: "center",
dataIndex: 'num',
+ width: 200,
},
{
title: '鐢熶骇绾垮悕绉�',
align: "center",
dataIndex: 'name',
+ width: 200,
+ },
+ {
+ title: '浣跨敤閮ㄩ棬',
+ align: "center",
+ dataIndex: 'useId_dictText',
+ width: 150,
+ },
+ {
+ title: '缁存姢閮ㄩ棬',
+ align: "center",
+ dataIndex: 'manageId_dictText',
+ width: 150,
+ },
+ {
+ title: '缁翠慨鐝粍',
+ align: "center",
+ dataIndex: 'teamId_dictText',
+ width: 150,
+ },
+ {
+ title: '宸ュ尯',
+ align: "center",
+ dataIndex: 'factoryModelId_dictText',
+ width: 150,
},
{
title: '璁惧鎬绘暟',
align: "center",
dataIndex: 'sumOfEquipment',
+ width: 150,
},
{
title: '鎿嶄綔',
@@ -206,8 +234,7 @@
scopedSlots: {
customRender: 'action',
},
- width: 147,
- fixed: 'right',
+ width: 150,
},
],
url: {
diff --git a/src/views/eam/FaultInfoList.vue b/src/views/eam/FaultInfoList.vue
index 28ac680..d0b7c59 100644
--- a/src/views/eam/FaultInfoList.vue
+++ b/src/views/eam/FaultInfoList.vue
@@ -108,7 +108,7 @@
</template>
<span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)" v-if="record.isConfirm!=='yes'">褰曞叆</a>
+ <a @click="handleEdit(record)" v-if="record.isConfirm!=='yes'" v-has="'fault:update'">褰曞叆</a>
<a-divider type="vertical" />
<a @click="handleDetail(record)">璇︽儏</a>
@@ -117,7 +117,7 @@
title="纭缁撴灉鍚庝笉鍙啀褰曞叆锛岀‘璁ゅ悧?"
@confirm="() => handleConfirm(record)"
>
- <a v-if="record.isConfirm!=='yes'">纭</a>
+ <a v-if="record.isConfirm!=='yes'" v-has="'fault:confirm'">纭</a>
</a-popconfirm>
</span>
diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index 4358a35..4ed1de1 100644
--- a/src/views/eam/MalfunctionRepair.vue
+++ b/src/views/eam/MalfunctionRepair.vue
@@ -193,6 +193,7 @@
@click="handleAdd"
type="primary"
icon="plus"
+ v-has="'report:add&edit'"
>鏂板</a-button>
</div>
@@ -218,6 +219,7 @@
<a
:disabled=" record.status !== '4'"
@click="handleAccept(record)"
+ v-has="'report:accept'"
>楠屾敹</a>
<!-- <a-popconfirm
v-if="record.status == '1' || record.status == '4'"
diff --git a/src/views/eam/QuanlityConfirmList.vue b/src/views/eam/QuanlityConfirmList.vue
index 098dcff..6f83d49 100644
--- a/src/views/eam/QuanlityConfirmList.vue
+++ b/src/views/eam/QuanlityConfirmList.vue
@@ -118,7 +118,7 @@
</template>
<span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)" :disabled="record.isConfirm==='yes'">纭</a>
+ <a @click="handleEdit(record)" :disabled="record.isConfirm==='yes'" v-has="'quanlity:confirm'">纭</a>
<!-- <a-divider type="vertical" />
<a-dropdown>
diff --git a/src/views/eam/RepairOrderList.vue b/src/views/eam/RepairOrderList.vue
index c8c491f..c60dd5a 100644
--- a/src/views/eam/RepairOrderList.vue
+++ b/src/views/eam/RepairOrderList.vue
@@ -229,6 +229,7 @@
type="primary"
icon="plus"
@click="getReports"
+ v-has="'repair:accept'"
>棰嗗彇</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('缁翠慨宸ュ崟')">瀵煎嚭</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
@@ -332,6 +333,7 @@
<a
v-if="record.status === '2' || record.status === '3' "
@click="handleOrderExe(record)"
+ v-has="'repair:excute'"
>鎵ц</a>
<a-divider
v-if="record.status === '2' || record.status === '3' "
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 3932501..2a4b56a 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -151,6 +151,40 @@
<a-row>
<a-col :span="6">
<a-form-model-item
+ label="鏄惁鐢熶骇绾胯澶�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="isLineEquip"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨"
+ :triggerChange="true"
+ :disabled="true"
+ dictCode="is_product"
+ v-model="model.isLineEquip"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鏄惁鐢熶骇绾�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="isLine"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨"
+ :triggerChange="true"
+ :disabled="true"
+ dictCode="is_product"
+ v-model="model.isLine"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
label="璁惧鍥剧墖"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -1025,7 +1059,6 @@
},
methods: {
add() {
- this
this.edit(this.modelDefault);
},
edit(record) {
@@ -1033,6 +1066,8 @@
this.model = Object.assign({}, record);
if (!this.model.id) {
this.model.equipmentStatus = '1'
+ this.model.isLineEquip = 'no'
+ this.model.isLine = 'no'
}
this.visible = true;
},
diff --git a/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue b/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
index 2cf2f80..a89ad24 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
@@ -178,7 +178,7 @@
visible: false,
loading: false,
url: {
- list: '/eam/equipment/list'
+ list: '/eam/equipment/getEquipmentList'
}
}
},
@@ -208,6 +208,7 @@
}
let that = this
this.loading = true
+ this.queryParam.isLine = 'no'
let params = this.getQueryParams()//鏌ヨ鏉′欢
// params.equipmentStatus = '1'
await getAction(this.url.list, params).then((res) => {
diff --git a/src/views/eam/modules/line/EquipmentOfLineForm.vue b/src/views/eam/modules/line/EquipmentOfLineForm.vue
index fcbd6a2..27122d3 100644
--- a/src/views/eam/modules/line/EquipmentOfLineForm.vue
+++ b/src/views/eam/modules/line/EquipmentOfLineForm.vue
@@ -49,6 +49,85 @@
></a-input>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="浣跨敤閮ㄩ棬"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="useId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
+ :triggerChange="true"
+ dictCode="sys_depart,depart_name,id,del_flag!='1'"
+ v-model="model.useId"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="6">
+ <a-form-model-item
+ label="缁存姢閮ㄩ棬"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="manageId"
+ >
+ <!-- <a-tree-select
+ :disabled="formDisabled"
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
+ tree-default-expand-all
+ v-model="model.manageId"
+ /> -->
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
+ :triggerChange="true"
+ dictCode="sys_depart,depart_name,id,del_flag!='1'"
+ v-model="model.manageId"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="teamId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨璐ｄ换鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,status='1' and del_flag='0'"
+ v-model="model.teamId"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="宸ュ尯"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="factoryModelId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨宸ュ尯"
+ :triggerChange="true"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="model.factoryModelId"
+ />
+ </a-form-model-item>
+ </a-col>
</a-row>
</a-form-model>
</j-form-container>
@@ -65,7 +144,6 @@
:disabled="formDisabled"
:rowNumber="true"
:rowSelection="true"
- :bordered="true"
:alwaysEdit="true"
:toolbar="true"
@valueChange="changeDate"
@@ -125,11 +203,11 @@
},
labelCol: {
xs: { span: 24 },
- sm: { span: 5 },
+ sm: { span: 11 },
},
wrapperCol: {
xs: { span: 24 },
- sm: { span: 16 },
+ sm: { span: 13 },
},
model:{
},
@@ -145,7 +223,19 @@
],
equipmentCategoryId:[
{ required: true, message: '璇疯緭鍏ュ垎绫�!' }
- ]
+ ],
+ manageId: [
+ { required: true, message: '璇烽�夋嫨缁存姢閮ㄩ棬!' },
+ ],
+ useId: [
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
+ ],
+ factoryModelId: [
+ { required: true, message: '璇烽�夋嫨宸ュ尯!' },
+ ],
+ teamId: [
+ { required: true, message: '璇烽�夋嫨璐ｄ换鐝粍!' },
+ ],
},
refKeys: ['equipmentOfLineTable', ],
tableKeys:['equipmentOfLineTable', ],
diff --git a/src/views/eam/modules/malfunctionRepair/AcceptModel.vue b/src/views/eam/modules/malfunctionRepair/AcceptModel.vue
index ac07169..03735f5 100644
--- a/src/views/eam/modules/malfunctionRepair/AcceptModel.vue
+++ b/src/views/eam/modules/malfunctionRepair/AcceptModel.vue
@@ -103,7 +103,6 @@
},
created() {
//澶囦唤model鍘熷鍊�
- this.initOptions();
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
diff --git a/src/views/eam/modules/malfunctionRepair/FaultDescriptionList.vue b/src/views/eam/modules/malfunctionRepair/FaultDescriptionList.vue
index 64ed6f3..acacf9a 100644
--- a/src/views/eam/modules/malfunctionRepair/FaultDescriptionList.vue
+++ b/src/views/eam/modules/malfunctionRepair/FaultDescriptionList.vue
@@ -95,7 +95,7 @@
this.loading = true
getAction(this.url.list, params)
.then(res => {
- if (res.success) {
+ if (res.success&&res.result!==null) {
//update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
this.dataSource = res.result.records
if (this.dataSource != null && this.dataSource != "") {
--
Gitblit v1.9.3