lipenghui 1 неделя назад
Родитель
Сommit
df9178b908
3 измененных файлов с 19 добавлено и 9 удалено
  1. 1 1
      src/locales/en.ts
  2. 1 1
      src/locales/zh-CN.ts
  3. 17 7
      src/views/pms/maintain/IotMaintainAddEdit.vue

+ 1 - 1
src/locales/en.ts

@@ -852,7 +852,7 @@ export default {
     dept:'Dept',
   },
   iotMaintain:{
-
+    showAllMaterials: 'Show all',
     deviceHolder:'Please select device',
     shutDownHolder:'ShutDown',
     ifNeed:'Are materials required',

+ 1 - 1
src/locales/zh-CN.ts

@@ -864,7 +864,7 @@ export default {
     supplier:'供应商',
     suppHolder:'请输入供应商',
     attachment:'委外相关附件',
-
+    showAllMaterials: '显示所有物料',
     repairType:'维修类型',
     shutDown:'是否停机',
     startTime:'维修开始时间',

+ 17 - 7
src/views/pms/maintain/IotMaintainAddEdit.vue

@@ -273,10 +273,10 @@
           <!--          <el-button @click="openMaterialForm" type="primary"-->
           <!--            ><Icon icon="ep:plus" class="mr-5px" /> 选择物料</el-button>-->
           <el-button @click="openMaintainForm" type="primary"
-          ><Icon icon="ep:plus" class="mr-5px" />
+          ><Icon icon="ep:select" class="mr-5px" />
             {{ t('iotMaintain.selectMaintenanceItem') }}</el-button
           >
-          <el-button @click="openMaintainItem" type="warning"
+          <el-button @click="openMaintainItem" type="primary"
           ><Icon icon="ep:plus" class="mr-5px" />
             {{ t('iotMaintain.addMaintenanceItems') }}</el-button
           >
@@ -338,14 +338,18 @@
       <!-- 搜索工作栏 -->
       <el-form class="-mb-15px" ref="queryFormRef" :inline="true" label-width="68px">
         <el-form-item>
-          <el-button type="danger" @click="openMaterialForm()">
-            <Icon icon="ep:plus" class="mr-5px" />
+          <el-button type="primary" @click="openMaterialForm()">
+            <Icon icon="ep:select" class="mr-5px" />
             {{ t('iotMaintain.selectMaterials') }}
           </el-button>
-          <el-button type="success" @click="addMaterial">
+          <el-button type="primary" @click="addMaterial">
             <Icon icon="ep:plus" class="mr-5px" />
             {{ t('iotMaintain.addMaterials') }}
           </el-button>
+          <el-button type="primary" @click="showAllMaterial">
+            <Icon icon="ep:star-filled" class="mr-5px" />
+            {{ t('iotMaintain.showAllMaterials') }}
+          </el-button>
         </el-form-item>
       </el-form>
     </ContentWrap>
@@ -587,6 +591,12 @@ const handleIfNeedChange = (row) =>{
   }
 }
 
+const showAllMaterial = () =>{
+  selectedRow.value = null;
+  selectedRowId.value = null;
+  filteredMaterials.value = materialList.value
+}
+
 const addMaterial = () =>{
   if (selectedRowId.value === null) {
     message.error('请点击选择维修项');
@@ -606,8 +616,8 @@ const addMaterial = () =>{
     quantity: null,
     materialSource: '手动添加'
   }
-  filteredMaterials.value.push(newMaterial);
-  materialList.value.push(newMaterial);
+  filteredMaterials.value.unshift(newMaterial);
+  materialList.value.unshift(newMaterial);
   list.value.forEach((item)=>{
     if (item.bomNodeId === selectedRowId.value) {
       item.materials = materialList.value.filter((item)=>item.bomNodeId===selectedRowId.value)