From 48280bcd3a6d1d3125dfec1912afa92ae2ff6eee Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期二, 02 九月 2025 16:59:40 +0800 Subject: [PATCH] mdc设备台账修改,设备管理设备台账修改 --- src/views/mdc/base/EquipmentList.vue | 11 +---- src/views/mdc/base/modules/EquipmentList/UserModal.vue | 14 ++----- src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue | 20 +--------- src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue | 20 +--------- src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue | 20 +--------- src/views/eam/equipment/EamEquipmentList.vue | 7 +++ 6 files changed, 18 insertions(+), 74 deletions(-) diff --git a/src/views/eam/equipment/EamEquipmentList.vue b/src/views/eam/equipment/EamEquipmentList.vue index 9524814..9686308 100644 --- a/src/views/eam/equipment/EamEquipmentList.vue +++ b/src/views/eam/equipment/EamEquipmentList.vue @@ -558,7 +558,7 @@ { title: '璧勪骇浣跨敤鐘舵��', align: 'center', - width: 100, + width: 120, dataIndex: 'assetStatus_dictText' }, { @@ -641,6 +641,7 @@ title: '瀹夎浣嶇疆', align: 'center', width: 100, + ellipsis: true, dataIndex: 'installationPosition' }, { @@ -652,6 +653,7 @@ title: '鏈哄簥鍘傚', align: 'center', width: 300, + ellipsis: true, dataIndex: 'manufacturingEnterprise' }, { @@ -664,6 +666,7 @@ title: '璁惧渚涘簲鍟�', align: 'center', width: 100, + ellipsis: true, dataIndex: 'supplier' }, { @@ -693,11 +696,13 @@ { title: '鍔熻兘鐢ㄩ��', align: 'center', + ellipsis: true, dataIndex: 'functionUse' }, { title: '鎬ц兘鎸囨爣', align: 'center', + ellipsis: true, dataIndex: 'performanceIndicators' }, { diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue index 2ed3a16..869b28e 100644 --- a/src/views/mdc/base/EquipmentList.vue +++ b/src/views/mdc/base/EquipmentList.vue @@ -27,15 +27,8 @@ </a-col> <a-col :md="4" :sm="4"> - <a-form-item label="璁惧绾у埆"> - <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="queryParam.deviceLevel" - allow-clear/> - </a-form-item> - </a-col> - - <a-col :md="4" :sm="4"> - <a-form-item label="璁惧绉嶇被"> - <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="queryParam.deviceCategory" + <a-form-item label="鍗曞厓"> + <j-dict-select-tag placeholder="璇烽�夋嫨鍗曞厓" dictCode="device_category" v-model="queryParam.deviceCategory" allow-clear/> </a-form-item> </a-col> diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue index b42763e..c8d1a80 100644 --- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue +++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue @@ -120,8 +120,8 @@ </a-form-model-item> </a-col> <a-col :span="12"> - <a-form-model-item label="璁惧绾у埆"> - <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="model.deviceLevel" + <a-form-model-item label="閰嶉�佸皬缁�" prop="teamCode"> + <j-dict-select-tag placeholder="璇烽�夋嫨閰嶉�佸皬缁�" dictCode="mdc_staff_team" v-model="model.teamCode" :disabled="disableSubmit"/> </a-form-model-item> </a-col> @@ -129,8 +129,8 @@ <a-row :gutter="24"> <a-col :span="12"> - <a-form-model-item label="璁惧绉嶇被"> - <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="model.deviceCategory" + <a-form-model-item label="鍗曞厓"> + <j-dict-select-tag placeholder="璇烽�夋嫨鍗曞厓" dictCode="device_category" v-model="model.deviceCategory" :disabled="disableSubmit"/> </a-form-model-item> </a-col> @@ -143,12 +143,6 @@ </a-row> <a-row :gutter="24"> - <a-col :span='12'> - <a-form-model-item label="閰嶉�佸皬缁�" prop="teamCode"> - <j-dict-select-tag placeholder="璇烽�夋嫨閰嶉�佸皬缁�" dictCode="mdc_staff_team" v-model="model.teamCode" - :disabled="disableSubmit"/> - </a-form-model-item> - </a-col> <a-col :span='12'> <a-form-model-item label="璁惧鍥剧墖"> <j-image-upload v-model="model.equipmentImage" :disabled="disableSubmit"/> diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue index c775e87..850332e 100644 --- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue +++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue @@ -43,28 +43,12 @@ :allowClear="false"/> </a-form-item> </a-col> - <a-col :md="5" :sm="5" :xs="5"> - <a-form-item label="璁惧绾у埆"> - <a-select - :value="queryParams.deviceLevel" - mode="multiple" - placeholder="璇烽�夋嫨璁惧绾у埆" - allow-clear - :maxTagCount="1" - @change="selectChange($event,'deviceLevel')" - > - <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index"> - {{item.label}} - </a-select-option> - </a-select> - </a-form-item> - </a-col> <a-col :md="4" :sm="4" :xs="4"> - <a-form-item label="璁惧绉嶇被"> + <a-form-item label="鍗曞厓"> <a-select :value="queryParams.deviceCategory" mode="multiple" - placeholder="璇烽�夋嫨璁惧绉嶇被" + placeholder="璇烽�夋嫨鍗曞厓" allow-clear :maxTagCount="1" @change="selectChange($event,'deviceCategory')" diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue index 5439aea..5b433d1 100644 --- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue +++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue @@ -45,27 +45,11 @@ </a-form-item> </a-col> <a-col :md="5" :sm="5" :xs="5"> - <a-form-item label="璁惧绾у埆"> - <a-select - :value="queryParams.deviceLevel" - mode="multiple" - placeholder="璇烽�夋嫨璁惧绾у埆" - allow-clear - :maxTagCount="1" - @change="selectChange($event,'deviceLevel')" - > - <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index"> - {{item.label}} - </a-select-option> - </a-select> - </a-form-item> - </a-col> - <a-col :md="5" :sm="5" :xs="5"> - <a-form-item label="璁惧绉嶇被"> + <a-form-item label="鍗曞厓"> <a-select :value="queryParams.deviceCategory" mode="multiple" - placeholder="璇烽�夋嫨璁惧绉嶇被" + placeholder="璇烽�夋嫨鍗曞厓" allow-clear :maxTagCount="1" @change="selectChange($event,'deviceCategory')" diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue index c44ed51..f882df9 100644 --- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue +++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue @@ -78,27 +78,11 @@ <a-row :gutter="24" v-if="toggleSearchStatus"> <a-col :md="5" :sm="5" :xs="5"> - <a-form-item label="璁惧绾у埆"> - <a-select - :value="queryParams.deviceLevel" - mode="multiple" - placeholder="璇烽�夋嫨璁惧绾у埆" - allow-clear - :maxTagCount="1" - @change="selectChange($event,'deviceLevel')" - > - <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index"> - {{item.label}} - </a-select-option> - </a-select> - </a-form-item> - </a-col> - <a-col :md="5" :sm="5" :xs="5"> - <a-form-item label="璁惧绉嶇被"> + <a-form-item label="鍗曞厓"> <a-select :value="queryParams.deviceCategory" mode="multiple" - placeholder="璇烽�夋嫨璁惧绉嶇被" + placeholder="璇烽�夋嫨鍗曞厓" allow-clear :maxTagCount="1" @change="selectChange($event,'deviceCategory')" -- Gitblit v1.9.3