From 5396a52f52305f4d1ea88627a6e6f0e811e8d89d Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 02 七月 2025 16:35:09 +0800
Subject: [PATCH] 1、数据字典配置时删除数据值不能使用下划线限制 2、设备台账列表字段自定义展示以及调整字段
---
src/views/eam/equipment/modules/EamEquipmentModal.vue | 163 +++++++---------------
src/views/eam/equipment/EamEquipmentLedger.vue | 231 ++++++++++-----------------------
src/views/system/modules/DictItemModal.vue | 2
3 files changed, 124 insertions(+), 272 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentLedger.vue b/src/views/eam/equipment/EamEquipmentLedger.vue
index 589f207..44f998d 100644
--- a/src/views/eam/equipment/EamEquipmentLedger.vue
+++ b/src/views/eam/equipment/EamEquipmentLedger.vue
@@ -29,17 +29,18 @@
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="浣跨敤閮ㄩ棬">
- <a-tree-select v-model="queryParam.orgId" style="width: 100%" :tree-data="treeDataAlias" show-search
+ <a-tree-select v-model="queryParam.factoryOrgCode" style="width: 100%" :tree-data="productionTreeData"
+ show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
treeNodeFilterProp="title" searchPlaceholder="璇疯緭鍏ュ叧閿瓧鎼滅储"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
- allow-clear tree-default-expand-all
- >
+ allow-clear tree-default-expand-all>
</a-tree-select>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="缁翠慨鐝粍">
- <a-tree-select v-model="queryParam.orgId" style="width: 100%" :tree-data="treeDataAlias"
+ <a-tree-select v-model="queryParam.repairDepartOrgCode" style="width: 100%"
+ :tree-data="repairDepartTreeData"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="璇烽�夋嫨缁翠慨鐝粍"
allow-clear tree-default-expand-all>
</a-tree-select>
@@ -102,10 +103,30 @@
:scroll="{ x: 'max-content' }"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"
- :customRow="customTableRow"
>
+ <!--缁熶竴缂栫爜-->
<template slot="equipmentCode" slot-scope="text">
<a href="#" @click="handleDetail(record)" style="display: inline-block;height: 100%">{{text}}</a>
+ </template>
+
+ <!--浣跨敤閮ㄩ棬-->
+ <template slot="factoryOrgCode" slot-scope="text,record">
+ {{[record.gsfactoryOrgCode_dictText,record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryOrgCode_dictText].filter(item=>item).join('/')}}
+ </template>
+
+ <!--瀹夎浣嶇疆-->
+ <template slot="installationPosition" slot-scope="text">
+ <j-ellipsis :value="text" :length="5"/>
+ </template>
+
+ <!--鎿嶄綔绯荤粺-->
+ <template slot="operationSystem" slot-scope="text">
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="+text" disabled/>
+ </template>
+
+ <!--璧勪骇鍒堕�犲晢-->
+ <template slot="manufacturingEnterprise" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
</template>
<span slot="action" slot-scope="text, record">
@@ -162,7 +183,7 @@
<!--</a-tabs>-->
<!-- 琛ㄥ崟鍖哄煙 -->
- <eamEquipment-modal ref="modalForm" @ok="modalFormOk" :treeDataAlias="treeDataAlias"/>
+ <eamEquipment-modal ref="modalForm" @ok="modalFormOk" :productionTreeData="productionTreeData"/>
<!--灞ュ巻寮圭獥-->
<resume-drawer ref="resumeDrawerRef" :currentTableRowRecord="currentTableRowRecord"/>
</a-card>
@@ -217,7 +238,6 @@
{
title: '鍏抽敭璁惧鏍囪瘑',
align: 'center',
- width: 150,
dataIndex: 'equipmentImportance',
fixed: 'left'
},
@@ -241,31 +261,32 @@
{
title: '浣跨敤閮ㄩ棬',
align: 'center',
- dataIndex: 'factoryOrgCode'
+ dataIndex: 'factoryOrgCode',
+ scopedSlots: { customRender: 'factoryOrgCode' }
},
{
title: '鎵�灞炲垎绫�',
align: 'center',
width: 100,
- dataIndex: 'equipmentCategory'
+ dataIndex: 'equipmentCategory_dictText'
},
{
title: '淇濆吇鐘舵��',
align: 'center',
width: 100,
- dataIndex: 'maintenanceStatus_dicText'
+ dataIndex: 'maintenanceStatus_dictText'
},
{
title: '缁翠慨鐘舵��',
align: 'center',
width: 100,
- dataIndex: 'repairStatus_dicText'
+ dataIndex: 'repairStatus_dictText'
},
{
title: '鎶�鏈姸鎬�',
align: 'center',
width: 100,
- dataIndex: 'technologyStatus_dicText'
+ dataIndex: 'technologyStatus_dictText'
},
{
title: 'ABC鏍囪瘑',
@@ -300,14 +321,13 @@
{
title: '鐏伀鍣ㄦ湁鏁堟湡',
align: 'center',
- width: 150,
dataIndex: 'fireExtinguisherExpirationDate'
},
{
title: '鎿嶄綔绯荤粺',
align: 'center',
- width: 100,
- dataIndex: 'operationSystem'
+ dataIndex: 'operationSystem',
+ scopedSlots: { customRender: 'operationSystem' }
},
{
title: '绯荤粺',
@@ -348,8 +368,8 @@
{
title: '瀹夎浣嶇疆',
align: 'center',
- width: 100,
- dataIndex: 'installationPosition'
+ dataIndex: 'installationPosition',
+ scopedSlots: { customRender: 'installationPosition' }
},
{
title: '鍑哄巶鏃ユ湡',
@@ -366,7 +386,6 @@
{
title: '璧勯噾鏉ユ簮',
align: 'center',
- width: 100,
dataIndex: 'fundingSource'
},
{
@@ -378,19 +397,18 @@
{
title: '鍑哄巶缂栧彿',
align: 'center',
- width: 100,
dataIndex: 'factoryNumber'
},
{
title: '璧勪骇鍒堕�犲晢',
align: 'center',
- width: 100,
- dataIndex: 'manufacturingEnterprise'
+ dataIndex: 'manufacturingEnterprise',
+ scopedSlots: { customRender: 'manufacturingEnterprise' },
+ ellipsis: true
},
{
title: '璧勪骇鏉ユ簮鍥藉',
align: 'center',
- width: 150,
dataIndex: 'originCountry'
},
{
@@ -408,7 +426,6 @@
{
title: '鎬诲姛鐜�',
align: 'center',
- width: 100,
dataIndex: 'equipmentPower'
},
{
@@ -424,7 +441,7 @@
{
title: '璧勪骇鐘舵��',
align: 'center',
- dataIndex: 'assetStatus'
+ dataIndex: 'assetStatus_dictText'
},
{
title: '鏈涓変繚鏃ユ湡',
@@ -474,14 +491,9 @@
getProductionTreeList: '/eam/BaseFactory/queryTreeList',
templateXlsDownloadUrl: '瀵煎叆妯℃澘/璁惧鍙拌处瀵煎叆妯℃澘_v1.1.xlsx'
},
- treeData: [],
- printedRows: [],
- activeTabKey: 1,
- appHomeUrl: '',
currentTableRowRecord: {},
- isOpenProcess: false,
- isOpenPrecision: false,
- treeDataAlias: []
+ productionTreeData: [],
+ repairDepartTreeData: []
}
},
computed: {
@@ -490,30 +502,37 @@
}
},
created() {
- this.loadAllProductionTree()
- this.loadAppHomeUrlConfigValue()
+ this.getProductionTreeDataByApi()
},
methods: {
- loadAllProductionTree() {
- //鍔犺浇杞﹂棿閫夋嫨鏍�
- getAction(this.url.getProductionTreeList).then(res => {
- if (res.success) {
- this.treeData = [...res.result]
- this.treeDataAlias = this.deepCopyAndModify(res.result)
- } else {
- this.$message.warning(res.message)
- }
- })
+ // 鑾峰彇浣跨敤閮ㄩ棬鏍�
+ getProductionTreeDataByApi() {
+ getAction(this.url.getProductionTreeList)
+ .then(res => {
+ if (res.success) {
+ this.productionTreeData = res.result
+ } else {
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
},
- /**
- * 寮�鍚摥鐗屽脊绐�
- * @param recordArray 琛ㄦ牸琛屼俊鎭泦鍚�
- */
- handleOpenNameplateModal(recordArray) {
- this.printedRows = recordArray
- this.$refs.nameplateModalRef.httpUrl = this.appHomeUrl
- this.$refs.nameplateModalRef.visible = true
+ // 鑾峰彇浣跨敤閮ㄩ棬鏍�
+ getProductionTreeDataByApi() {
+ getAction(this.url.getProductionTreeList)
+ .then(res => {
+ if (res.success) {
+ this.productionTreeData = res.result
+ } else {
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
},
/**
@@ -528,118 +547,8 @@
this.$nextTick(() => this.$refs.resumeDrawerRef.getEquipmentResumeByApi())
},
- /**
- * 鑷畾涔夎澶囧彴璐﹁〃鏍艰
- * @param record 琛ㄦ牸琛屼俊鎭�
- * @returns {{style: {cursor: string}, on: {click: *}}} 鏍峰紡瀵硅薄涓庝簨浠舵柟娉�
- */
- customTableRow(record) {
- return {
- style: {
- cursor: 'pointer'
- },
- on: {
- click: () => {
- this.onSelectChange([record.id])
- }
- }
- }
- },
-
- /**
- * 椤电鏀瑰彉鏃惰Е鍙�
- * @param activeTabKey 褰撳墠婵�娲荤殑椤电key
- */
- handleTabChange(activeTabKey) {
- if (this.selectedRowKeys.length !== 1) return
- this.$nextTick(() => this.loadTabPaneTableData(this.selectedRowKeys[0]))
- },
-
- /**
- * 鍔犺浇椤电琛ㄦ牸鏁版嵁
- * @param id 璁惧鍙拌处琛岃褰旾d
- */
- loadTabPaneTableData(id) {
- this.$refs['tabPaneTableListRef' + this.activeTabKey].queryParam.equipmentId = id
- this.$refs['tabPaneTableListRef' + this.activeTabKey].loadData(1)
- },
-
- /**
- * 璁惧鍙拌处琛ㄦ牸澶氶�夋鐘舵�佹敼鍙樻椂瑙﹀彂
- * @param selectedRowKeys 宸查�夋嫨鐨剅owKey闆嗗悎
- * @param selectionRows 褰撳墠鍒嗛〉涓嬪凡閫夋嫨鐨勮淇℃伅闆嗗悎
- */
- onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedRowKeys = selectedRowKeys
- this.selectionRows = selectionRows
- this.$refs['tabPaneTableListRef' + this.activeTabKey].queryParam.equipmentId = null
- this.$refs['tabPaneTableListRef' + this.activeTabKey].dataSource = []
- this.$refs['tabPaneTableListRef' + this.activeTabKey].onClearSelected()
- if (selectedRowKeys.length === 1) {
- let row = this.dataSource.find(row => row.id === selectedRowKeys[0])
- if (row) {
- this.isOpenProcess = (row.processParametersFlag === '1')
- this.isOpenPrecision = (row.precisionParametersFlag === '1')
- } else {
- this.isOpenProcess = false
- this.isOpenPrecision = false
- }
- this.loadTabPaneTableData(selectedRowKeys[0])
- } else {
- this.isOpenProcess = false
- this.isOpenPrecision = false
- }
- //tab鏍囩琚攢姣佷簡锛岃繑鍥炵涓�涓猼ab
- if (!this.isOpenProcess && this.activeTabKey === 6) {
- this.activeTabKey = 1
- }
- if (!this.isOpenPrecision && this.activeTabKey === 7) {
- this.activeTabKey = 1
- }
- },
-
handleTemplateXlsDownload() {
templateXlsDownload(this.url.templateXlsDownloadUrl)
- },
-
- loadAppHomeUrlConfigValue() {
- let params = { settingKey: 'app_home_url' }
- getSystemConfigValue(params).then(res => {
- if (res.success) {
- this.appHomeUrl = res.result.settingValue
- }
- })
- },
- deepCopyAndModify(arr) {
- // 濡傛灉褰撳墠鍏冪礌涓嶆槸鏁扮粍鎴栧璞★紝鐩存帴杩斿洖
- if (!Array.isArray(arr) && typeof arr !== 'object' || arr === null || arr.length === 0) {
- return arr
- }
-
- // 濡傛灉鏄暟缁勶紝鍒涘缓涓�涓柊鏁扮粍骞堕�掑綊澶勭悊姣忎釜鍏冪礌
- if (Array.isArray(arr)) {
- const newArray = []
- for (let i = 0; i < arr.length; i++) {
- newArray.push(this.deepCopyAndModify(arr[i]))
- }
- return newArray
- }
-
- // 濡傛灉鏄璞★紝鍒涘缓涓�涓柊瀵硅薄骞堕�掑綊澶勭悊姣忎釜灞炴��
- const newObj = {}
- for (const key in arr) {
- if (arr.hasOwnProperty(key)) {
- if (key === 'selectable') {
- newObj[key] = true
- } else if (key === 'children') {
- newObj[key] = this.deepCopyAndModify(arr[key])
- } else {
- newObj[key] = arr[key]
- }
-
- }
- }
- return newObj
}
}
}
diff --git a/src/views/eam/equipment/modules/EamEquipmentModal.vue b/src/views/eam/equipment/modules/EamEquipmentModal.vue
index 3c2df03..88767b5 100644
--- a/src/views/eam/equipment/modules/EamEquipmentModal.vue
+++ b/src/views/eam/equipment/modules/EamEquipmentModal.vue
@@ -6,52 +6,46 @@
centered
:confirmLoading="confirmLoading"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
- switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
cancelText="鍏抽棴">
- <a-tabs tab-position="left">
- <a-tab-pane tab="鍩虹淇℃伅" :key="1">
- <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-row :gutter="24">
+ <a-spin :spinning="confirmLoading">
+ <j-form-container :disabled="disableSubmit">
+ <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol"
+ :wrapperCol="wrapperCol" slot="detail">
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="鍏抽敭璁惧鏍囪瘑">
<j-dict-select-tag dict-code="equipment_importance" placeholder="璇疯緭鍏ュ叧閿澶囨爣璇�"
- v-model="model.equipmentImportance" :disabled="editable || disableSubmit"/>
+ v-model="model.equipmentImportance"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item prop="equipmentCode" label="缁熶竴缂栫爜">
- <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜" v-model="model.equipmentCode" :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜" v-model="model.equipmentCode"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item prop="equipmentName" label="璁惧鍚嶇О">
- <a-input placeholder="璇疯緭鍏ヨ澶囧悕绉�" v-model="model.equipmentName" :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ヨ澶囧悕绉�" v-model="model.equipmentName"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item prop="factoryOrgCode" label="浣跨敤閮ㄩ棬">
- <a-tree-select v-model="model.factoryOrgCode"
- style="width: 100%"
- show-search
- :tree-data="treeDataAlias"
- :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
- placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
- allow-clear
- treeNodeFilterProp="title"
- searchPlaceholder="璇疯緭鍏ュ叧閿瓧鎼滅储"
- tree-default-expand-all/>
+ <a-tree-select v-model="model.factoryOrgCode" style="width: 100%" show-search
+ :tree-data="productionTreeData" :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬" allow-clear treeNodeFilterProp="title"
+ :replaceFields="{key:'orgCode',value:'orgCode'}"
+ searchPlaceholder="璇疯緭鍏ュ叧閿瓧鎼滅储" tree-default-expand-all/>
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item prop="equipmentCategory" label="鎵�灞炲垎绫�">
<j-dict-select-tag dict-code="equipment_category" placeholder="璇烽�夋嫨鎵�灞炲垎绫�"
- v-model="model.equipmentCategory"
- :disabled="editable || disableSubmit"/>
+ v-model="model.equipmentCategory"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
@@ -66,37 +60,33 @@
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="ABC鏍囪瘑">
- <j-dict-select-tag dict-code="abc_flag" placeholder="璇烽�夋嫨ABC鏍囪瘑" v-model="model.abcFlag"
- :disabled="editable || disableSubmit"/>
+ <j-dict-select-tag dict-code="abc_flag" placeholder="璇烽�夋嫨ABC鏍囪瘑" v-model="model.abcFlag"/>
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item prop="repairDepartOrgCode" label="缁翠慨鐝粍">
- <a-input placeholder="璇烽�夋嫨缁翠慨鐝粍" v-model="model.repairDepartOrgCode"
- :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇烽�夋嫨缁翠慨鐝粍" v-model="model.repairDepartOrgCode"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="瀹夊叏閰嶇疆">
- <a-input placeholder="璇疯緭鍏ュ畨鍏ㄩ厤缃�" v-model="model.securityConfiguration"
- :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ュ畨鍏ㄩ厤缃�" v-model="model.securityConfiguration"/>
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="鍐峰嵈绯荤粺">
- <j-dict-select-tag dict-code="cooling_system" placeholder="璇疯緭鍏ョ粺涓�缂栫爜" v-model="model.coolSystem"
- :disabled="editable || disableSubmit"/>
+ <j-dict-select-tag dict-code="cooling_system" placeholder="璇烽�夋嫨鍐峰嵈绯荤粺" v-model="model.coolSystem"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鐏伀鍣�">
- <a-input placeholder="璇疯緭鍏ョ伃鐏櫒" v-model="model.fireExtinguisher" :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ョ伃鐏櫒" v-model="model.fireExtinguisher"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
@@ -112,47 +102,43 @@
</a-col>
</a-row>
- <a-row :gutter="24">
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="绯荤粺">
- <a-input placeholder="璇疯緭鍏ョ郴缁�" v-model="model.system" :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ョ郴缁�" v-model="model.system"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="璁惧绔彛">
- <a-input placeholder="璇疯緭鍏ヨ澶囩鍙�" v-model="model.equipmentPort" :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ヨ澶囩鍙�" v-model="model.equipmentPort"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鍧愭爣鏁伴噺">
- <a-input-number placeholder="璇疯緭鍏ュ潗鏍囨暟閲�" v-model="model.coordinateNum" :min="0" style="width: 100%"
- :disabled="editable || disableSubmit"/>
+ <a-input-number placeholder="璇疯緭鍏ュ潗鏍囨暟閲�" v-model="model.coordinateNum" :min="0" style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="閲嶉噺">
- <a-input-number placeholder="璇疯緭鍏ラ噸閲�" v-model="model.equipmentWeight" :min="0" style="width: 100%"
- :disabled="editable || disableSubmit"/>
+ <a-input-number placeholder="璇疯緭鍏ラ噸閲�" v-model="model.equipmentWeight" :min="0" style="width: 100%"/>
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="閲嶉噺璁￠噺鍗曚綅">
- <a-input placeholder="璇疯緭鍏ラ噸閲忚閲忓崟浣�" v-model="model.weightUnit" :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ラ噸閲忚閲忓崟浣�" v-model="model.weightUnit"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鍔熻兘浣嶇疆">
- <a-input placeholder="璇疯緭鍏ュ姛鑳戒綅缃�" v-model="model.functionalLocation"
- :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ュ姛鑳戒綅缃�" v-model="model.functionalLocation"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="瀹夎浣嶇疆">
- <a-input placeholder="璇疯緭鍏ュ畨瑁呬綅缃�" v-model="model.installationPosition"
- :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ュ畨瑁呬綅缃�" v-model="model.installationPosition"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
@@ -162,15 +148,15 @@
</a-col>
</a-row>
- <a-row :gutter="24">
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="绔嬮」鍗″彿">
- <a-input placeholder="璇疯緭鍏ョ珛椤瑰崱鍙�" v-model="model.cardNumber" :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ョ珛椤瑰崱鍙�" v-model="model.cardNumber"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="璧勯噾鏉ユ簮">
- <a-input placeholder="璇疯緭鍏ヨ祫閲戞潵婧�" v-model="model.fundingSource" :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ヨ祫閲戞潵婧�" v-model="model.fundingSource"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
@@ -180,40 +166,38 @@
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鍑哄巶缂栧彿">
- <a-input placeholder="璇疯緭鍏ュ嚭鍘傜紪鍙�" v-model="model.factoryNumber" :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ュ嚭鍘傜紪鍙�" v-model="model.factoryNumber"/>
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="璧勪骇鍒堕�犲晢">
- <a-input placeholder="璇疯緭鍏ヨ祫浜у埗閫犲晢" v-model="model.manufacturingEnterprise"
- :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ヨ祫浜у埗閫犲晢" v-model="model.manufacturingEnterprise"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="璧勪骇鏉ユ簮鍥藉">
- <a-input placeholder="璇疯緭鍏ヨ祫浜ф潵婧愬浗瀹�" v-model="model.originCountry" :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ヨ祫浜ф潵婧愬浗瀹�" v-model="model.originCountry"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鍨嬪彿">
- <a-input placeholder="璇疯緭鍏ュ瀷鍙�" v-model="model.equipmentModel" :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ュ瀷鍙�" v-model="model.equipmentModel"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="璁惧瑙勬牸">
- <a-input placeholder="璇疯緭鍏ヨ澶囪鏍�" v-model="model.equipmentSpecification"
- :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ヨ澶囪鏍�" v-model="model.equipmentSpecification"/>
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="鎬诲姛鐜�">
- <a-input placeholder="璇疯緭鍏ユ�诲姛鐜�" v-model="model.equipmentPower" :disabled="editable || disableSubmit"/>
+ <a-input placeholder="璇疯緭鍏ユ�诲姛鐜�" v-model="model.equipmentPower"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
@@ -228,13 +212,12 @@
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="璧勪骇鐘舵��">
- <j-dict-select-tag dict-code="asset_status" placeholder="璇烽�夋嫨璧勪骇鐘舵��" v-model="model.assetStatus"
- :disabled="editable || disableSubmit"/>
+ <j-dict-select-tag dict-code="asset_status" placeholder="璇烽�夋嫨璧勪骇鐘舵��" v-model="model.assetStatus"/>
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="鏈涓変繚鏃ユ湡">
<a-date-picker v-model="model.latestThirdMaintenance" value-format="YYYY-MM-DD" style="width:100%"/>
@@ -247,7 +230,8 @@
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="涓変繚鍛ㄦ湡">
- <a-date-picker v-model="model.thirdMaintenancePeriod" value-format="YYYY-MM-DD" style="width:100%"/>
+ <a-input-number placeholder="璇疯緭鍏ヤ笁淇濆懆鏈�" v-model="model.thirdMaintenancePeriod" :min="0"
+ style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
@@ -257,7 +241,7 @@
</a-col>
</a-row>
- <a-row :gutter="24">
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="涓嬫鎶�鏈壌瀹氭棩鏈�">
<a-date-picker v-model="model.nextTechnologyCheck" value-format="YYYY-MM-DD" style="width:100%"/>
@@ -265,40 +249,14 @@
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鎶�鏈壌瀹氬懆鏈�">
- <a-date-picker v-model="model.technologyCheckPeriod" value-format="YYYY-MM-DD" style="width:100%"/>
+ <a-input-number placeholder="璇疯緭鍏ユ妧鏈壌瀹氬懆鏈�" v-model="model.technologyCheckPeriod" :min="0"
+ style="width: 100%"/>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
- </a-tab-pane>
-
- <template v-if="disableSubmit">
- <a-tab-pane tab="璁惧鏂囨。" :key="2">
- </a-tab-pane>
-
- <a-tab-pane tab="鐐规宸ュ崟" :key="3">
- </a-tab-pane>
-
- <a-tab-pane tab="浜屼繚宸ュ崟" :key="4">
- </a-tab-pane>
-
- <a-tab-pane tab="涓変繚宸ュ崟" :key="5">
- </a-tab-pane>
-
- <a-tab-pane tab="缁翠慨宸ュ崟" :key="6">
- </a-tab-pane>
-
- <a-tab-pane tab="淇濆吇鏍囧噯" :key="7">
- </a-tab-pane>
-
- <a-tab-pane tab="宸ヨ壓鍙傛暟" :key="8">
- </a-tab-pane>
-
- <a-tab-pane tab="璁惧绮惧害" :key="9">
-
- </a-tab-pane>
- </template>
- </a-tabs>
+ </j-form-container>
+ </a-spin>
</j-modal>
</template>
@@ -309,7 +267,7 @@
export default {
name: 'EamEquipmentModal',
props: {
- treeDataAlias: {
+ productionTreeData: {
type: Array
}
},
@@ -360,8 +318,7 @@
},
url: {
add: '/eam/equipment/add',
- edit: '/eam/equipment/edit',
- getProductionTreeList: '/eam/BaseFactory/queryTreeList'
+ edit: '/eam/equipment/edit'
}
}
},
@@ -380,20 +337,6 @@
this.editable = true
this.model = Object.assign({}, record)
this.visible = true
- },
- loadAllProductionTree() {
- //鍔犺浇杞﹂棿閫夋嫨鏍�
- getAction(this.url.getProductionTreeList)
- .then(res => {
- if (res.success) {
- this.productionTreeData = res.result
- } else {
- this.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- })
},
handleOk() {
diff --git a/src/views/system/modules/DictItemModal.vue b/src/views/system/modules/DictItemModal.vue
index 26fabe7..d1c39d8 100644
--- a/src/views/system/modules/DictItemModal.vue
+++ b/src/views/system/modules/DictItemModal.vue
@@ -164,7 +164,7 @@
param.id = this.model.id
}
if(value){
- let reg=new RegExp("[`_~!@#$^&*()=|{}'.<>銆娿��/?锛侊骏锛堬級鈥斻�愩�戔�橈紱锛氣�濃�溿�傦紝銆侊紵]")
+ let reg=new RegExp("[`~!@#$^&*()=|{}'.<>銆娿��/?锛侊骏锛堬級鈥斻�愩�戔�橈紱锛氣�濃�溿�傦紝銆侊紵]")
if(reg.test(value)){
callback("鏁版嵁鍊间笉鑳藉寘鍚壒娈婂瓧绗︼紒")
}else{
--
Gitblit v1.9.3