From cbcff3e56c65e8b0d10498571f2705a5ae730ff9 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 06 九月 2023 10:42:34 +0800
Subject: [PATCH] 导入字段校验调整
---
src/views/eam/EquipmentList.vue | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/src/views/eam/EquipmentList.vue b/src/views/eam/EquipmentList.vue
index cb2edeb..b50aadb 100644
--- a/src/views/eam/EquipmentList.vue
+++ b/src/views/eam/EquipmentList.vue
@@ -8,6 +8,7 @@
<a-form-item label="璁惧鎵�灞炲垎绫�">
<j-search-select-tag
dict="mom_eam_equipment_category,name,id"
+ placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
v-model="queryParam.equipmentCategoryId"
/>
</a-form-item>
@@ -48,10 +49,10 @@
@click="searchReset"
icon="reload"
>閲嶇疆</a-button>
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('璁惧鍙拌处')">瀵煎嚭</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">瀵煎叆</a-button>
+ <a-button type="primary" icon="import" v-has="'equipmentAccount:add&delete&import&Edit'">瀵煎叆</a-button>
</a-upload>
</div>
@@ -206,13 +207,20 @@
<a-menu-item>
<a @click="equipmentResumeShow(record)">璁惧灞ュ巻</a>
</a-menu-item>
- <a-menu-item>
- <a @click="handleEdit(record)">缂栬緫</a>
+ <a-menu-item v-has="'accountSons:add&edit&delete&submit'" v-if="record.processParameters==1">
+ <a @click="editProcess(record)">宸ヨ壓鍙傛暟缁存姢</a>
+ </a-menu-item>
+ <a-menu-item v-has="'accountSons:add&edit&delete&submit'" v-if="record.precisionParameters==1">
+ <a @click="editPrecision(record)">绮惧害鍙傛暟缁存姢</a>
+ </a-menu-item>
+ <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
+ <a @click="handleEdit(record)" >缂栬緫</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
+ v-has="'equipmentAccount:add&delete&import&Edit'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
@@ -229,16 +237,23 @@
<a-tabs defaultActiveKey="1">
<a-tab-pane tab="宸ヨ壓鍙傛暟" key="1" >
- <EquipmentProcessParametersList :mainId="equipmentProcessParametersMainId" />
+ <EquipmentProcessParametersList
+ :mainId="equipmentProcessParametersMainId"
+ :isOpen="isOpenProcess"
+ />
</a-tab-pane>
<a-tab-pane tab="璁惧绮惧害" key="2" forceRender>
- <EquipmentPrecisionParametersList :mainId="equipmentPrecisionParametersMainId" />
+ <EquipmentPrecisionParametersList
+ :isOpen="isOpenPrecision"
+ :mainId="equipmentPrecisionParametersMainId" />
</a-tab-pane>
<a-tab-pane tab="璁惧鏂囨。" key="3" forceRender>
<EquipmentDocumentList :mainId="equipmentDocumentMainId" />
</a-tab-pane>
</a-tabs>
<equipment-modal ref="modalForm" @ok="modalFormOk"></equipment-modal>
+ <process-edit-model ref ="processEditModel"></process-edit-model>
+ <precision-edit-model ref ="precisionEditModel"></precision-edit-model>
</a-card>
</template>
@@ -253,7 +268,9 @@
import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
import '@/assets/less/TableExpand.less'
import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer'
-import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
+ import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
+ import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
+ import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel.vue'
export default {
@@ -265,7 +282,9 @@
EquipmentPrecisionParametersList,
EquipmentModal,
EquipmentResumeDrawer,
- JSearchSelectTag
+ JSearchSelectTag,
+ ProcessEditModel,
+ PrecisionEditModel,
},
data () {
return {
@@ -508,6 +527,8 @@
equipmentProcessParametersMainId: '',
equipmentDocumentMainId: '',
equipmentPrecisionParametersMainId: '',
+ isOpenPrecision:true,
+ isOpenProcess:true,
}
},
created() {
@@ -541,12 +562,21 @@
this.selectedMainId=''
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId=selectedRowKeys[0]
+ if(selectedRowKeys.length==1){
+ this.equipmentProcessParametersMainId = selectionRows[0]['id']
+ this.equipmentDocumentMainId = selectionRows[0]['id']
+ this.equipmentPrecisionParametersMainId = selectionRows[0]['id']
+ this.selectedMainId=selectedRowKeys[0]
+ this.isOpenProcess = selectionRows[0].processParameters==1;
+ this.isOpenPrecision = selectionRows[0].precisionParameters==1;
+ }else{
+ this.equipmentProcessParametersMainId =''
+ this.equipmentDocumentMainId = ''
+ this.equipmentPrecisionParametersMainId = ''
+ this.selectedMainId=''
+ }
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
- this.equipmentProcessParametersMainId = selectionRows[0]['id']
- this.equipmentDocumentMainId = selectionRows[0]['id']
- this.equipmentPrecisionParametersMainId = selectionRows[0]['id']
},
loadData(arg) {
if(!this.url.list){
@@ -630,6 +660,12 @@
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);
}
}
}
--
Gitblit v1.9.3