1.新增机器设备单条设备信息删除

2.非标设备主材设备为空时不参与计算，以及相关单位修改

src/api/assetsCalculateEqptData.js

@@ -59,3 +59,8 @@ export function updateBatchNonSData(params) {
 export function getEqptTableFilterVO(params) {
     return request.get('/assetsCalculateEqptData/getEqptTableFilterVO', { params: params })
 }
+
+// 根据机器设备信息id删除
+export function deleteEqptDataById(params) {
+    return request.delete(`/assetsCalculateEqptData/deleteEqptDataById/${params}`)
+}

src/views/assets/workbench/calculate/importInfo.vue

@@ -385,7 +385,7 @@
           <template #default="{ row }">
             <span>
               {{ row.depreciationRateByAge =
-              ((row.economicServiceLife - row.yearsInUse) / row.economicServiceLife < 0.15) ? ((row.remainingUsefulLife * 1 / (row.yearsInUse * 1 + row.remainingUsefulLife * 1)).toFixed(2) * 100) : ((row.economicServiceLife - row.yearsInUse) / row.economicServiceLife).toFixed(2) * 100 }}
+              ((row.economicServiceLife - row.yearsInUse) / row.economicServiceLife < 0.15) ? ((row.remainingUsefulLife * 1 / (row.yearsInUse * 1 + row.remainingUsefulLife * 1)).toFixed(2) * 100) : ((row.economicServiceLife * 1 - row.yearsInUse * 1).toFixed(2) / row.economicServiceLife) * 100 }}
             </span>
           </template>
         </vxe-column>
@@ -587,6 +587,13 @@
             </span>
           </template>
         </vxe-column>
+        <vxe-column title="操作" width="60">
+          <template #default="{ row }">
+            <span>
+              <el-button type="primary" size="small" link @click="deleteEqptDataById(row.id)">删除</el-button>
+            </span>
+          </template>
+        </vxe-column>
       </vxe-table>
       <vxe-table
         style="margin-top:8px"
@@ -851,21 +858,22 @@
         <vxe-column field="inquiryBasis" title="价格来源" width="160"></vxe-column>
         <vxe-column field="inquiryLocation" title="询价地点" width="160"></vxe-column>
         <vxe-column field="material1" title="主材1" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
-        <vxe-column field="material1Quantity" title="主材1用量" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
-        <vxe-column field="material1UseRatio" title="主材1利用率%" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
-        <vxe-column field="material1Price" title="主材1单价（元/吨）" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
-        <vxe-column field="material2" title="主材2" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
-        <vxe-column field="material2Quantity" title="主材2用量" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
-        <vxe-column field="material2UseRatio" title="主材2利用率%" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
-        <vxe-column field="material2Price" title="主材2单价（元/吨）" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
+        <vxe-column field="material1Quantity" title="主材1用量（吨/方）" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
+        <vxe-column field="material1UseRatio" title="主材1利用率%" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
+        <vxe-column field="material1Price" title="主材1单价（元/（吨/方））" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
+        <vxe-column field="material2" title="主材2（没有填 无）" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
+        <vxe-column field="material2Quantity" title="主材2用量（吨/方）" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
+        <vxe-column field="material2UseRatio" title="主材2利用率%" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
+        <vxe-column field="material2Price" title="主材2单价（元/（吨/方））" width="160" :edit-render="{ name: 'VxeNumberInput' }"></vxe-column>
         <vxe-column field="mainMaterialCost" title="主材费/设备报价（含税不含运费不含安装调试费）" width="160">
           <template #default="{ row }">
-            <span>
-              {{ row.mainMaterialCost = isNaN((row.material1Quantity / (row.material1UseRatio / 100) *
-              row.material1Price + row.material2Quantity / (row.material2UseRatio / 100) *
-              row.material2Price).toFixed(0)) ? 0 : (row.material1Quantity / (row.material1UseRatio / 100) *
-              row.material1Price + row.material2Quantity / (row.material2UseRatio / 100) *
-              row.material2Price).toFixed(0) }}
+            <span>{{ row.mainMaterialCost = isNaN(((row.material2 && row.material2 !== '无') 
+              ? ((row.material1Quantity / (row.material1UseRatio / 100) * row.material1Price) + (row.material2Quantity / (row.material2UseRatio / 100) * row.material2Price)).toFixed(0) 
+              : (row.material1Quantity / (row.material1UseRatio / 100) * row.material1Price).toFixed(0))) 
+              ? 0 
+              : ((row.material2 && row.material2 !== '无') 
+              ? ((row.material1Quantity / (row.material1UseRatio / 100) * row.material1Price) + (row.material2Quantity / (row.material2UseRatio / 100) * row.material2Price)).toFixed(0) 
+              : (row.material1Quantity / (row.material1UseRatio / 100) * row.material1Price).toFixed(0)) }}
             </span>
           </template>
         </vxe-column>
@@ -1032,7 +1040,7 @@ import {
   getNonSDataPage,
   updateNonSData,
   updateBatchNonSData,
-  getEqptTableFilterVO,
+  deleteEqptDataById
 } from '@/api/assetsCalculateEqptData'
 import { getDaysBetween } from '@/utils/date'
 import { eqptLifeIfrRefsList } from '@/api/eqptLifeIfrRefs'
@@ -1164,11 +1172,24 @@ export default {
     TableFilter,
   },
   mounted() {
+    // 全部测算表工具组件注册
     const $allTableRef = this.$refs.allTableRef
     const $toolAllTableRef = this.$refs.toolAllTableRef
     if ($allTableRef && $toolAllTableRef) {
       $allTableRef.connect($toolAllTableRef)
     }
+    // 进口测算表工具组件注册
+    const $importedTableRef = this.$refs.importedTableRef
+    const $toolImportedTableRef = this.$refs.toolImportedTableRef
+    if ($importedTableRef && $toolImportedTableRef) {
+      $importedTableRef.connect($toolImportedTableRef)
+    }
+    // 非标测算表工具组件注册
+    const $nonStandardTableRef = this.$refs.nonStandardTableRef
+    const $toolNonStandardTableRef = this.$refs.toolNonStandardTableRef
+    if ($nonStandardTableRef && $toolNonStandardTableRef) {
+      $nonStandardTableRef.connect($toolNonStandardTableRef)
+    }
   },
   computed: {
     ...mapStores(assetsProjectInfo),
@@ -1962,6 +1983,18 @@ export default {
     downloadDeclarationForm() {
       fileUtil.download('/file/download/assets/declarationForm?tmplCode=DECLARATION_FORM')
     },
+    deleteEqptDataById(eqptId) {
+      deleteEqptDataById(eqptId).then(res => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: 'success',
+          })
+          this.getEqptDataPage()
+        }
+      })
+    }
   },
 }
 </script>