Kaynağa Gözat

pms 保养工单 填报 详情 查询多累计属性运行记录填报值

zhangcl 1 ay önce
ebeveyn
işleme
4d26f4085d

+ 5 - 0
src/api/pms/iotmainworkorderbom/index.ts

@@ -46,6 +46,11 @@ export interface IotMainWorkOrderBomVO {
   version: number // 版本
   // 扩展字段
   timeError: string // 运行时间周期 错误提示
+
+  totalMileage: number  // 累计运行公里数
+  totalRunTime: number  // 累计运行时间
+  tempTotalMileage: number  // 临时 累计运行公里数
+  tempTotalRunTime: number  // 临时 累计运行时间
 }
 
 // PMS 保养计划明细BOM API

+ 10 - 2
src/views/pms/iotmainworkorder/IotMainWorkOrder.vue

@@ -90,8 +90,16 @@
         <el-table-column :label="t('bomList.bomNode')" align="center" prop="bomNodeId" v-if="false"/>
         <el-table-column :label="t('iotDevice.code')" align="center" prop="deviceCode" />
         <el-table-column :label="t('iotDevice.name')" align="center" prop="deviceName" />
-        <el-table-column :label="t('operationFillForm.sumTime')" align="center" prop="totalRunTime" :formatter="erpPriceTableColumnFormatter"/>
-        <el-table-column :label="t('operationFillForm.sumKil')" align="center" prop="totalMileage" :formatter="erpPriceTableColumnFormatter"/>
+        <el-table-column :label="t('operationFillForm.sumTime')" align="center" prop="totalRunTime" :formatter="erpPriceTableColumnFormatter">
+          <template #default="{ row }">
+            {{ row.totalRunTime ?? row.tempTotalRunTime }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="t('operationFillForm.sumKil')" align="center" prop="totalMileage" :formatter="erpPriceTableColumnFormatter">
+          <template #default="{ row }">
+            {{ row.totalMileage ?? row.tempTotalMileage }}
+          </template>
+        </el-table-column>
         <el-table-column :label="t('mainPlan.MaintItems')" align="center" prop="name" :show-overflow-tooltip="false" :width="maintItemsWidth" >
           <template #default="{ row }">
             <div class="full-content-cell"> <!-- 自定义样式 -->

+ 14 - 25
src/views/pms/iotmainworkorder/IotMainWorkOrderDetail.vue

@@ -26,11 +26,6 @@
                 />
               </el-select>
             </el-form-item>
-            <!--
-            <el-form-item label="工单编号" prop="orderNumber">
-              <el-input type="text" v-model="formData.orderNumber" disabled/>
-            </el-form-item>
-            -->
           </el-col>
           <el-col :span="8">
             <el-form-item :label="t('operationFill.duty')" prop="responsiblePerson">
@@ -112,24 +107,6 @@
     </el-form>
   </ContentWrap>
   <ContentWrap>
-    <ContentWrap>
-      <!-- 搜索工作栏 -->
-      <el-form
-        class="-mb-15px"
-        :model="queryParams"
-        ref="queryFormRef"
-        :inline="true"
-        label-width="68px"
-      >
-        <!--
-        <el-form-item>
-          <el-button @click="openForm" type="warning">
-            <Icon icon="ep:plus" class="mr-5px" /> 新增设备</el-button>
-        </el-form-item>
-        -->
-      </el-form>
-    </ContentWrap>
-
     <!-- 列表 -->
     <ContentWrap>
       <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
@@ -143,8 +120,16 @@
         <el-table-column :label="t('bomList.bomNode')" align="center" prop="bomNodeId" v-if="false"/>
         <el-table-column :label="t('iotDevice.code')" align="center" prop="deviceCode" />
         <el-table-column :label="t('iotDevice.name')" align="center" prop="deviceName" />
-        <el-table-column :label="t('operationFillForm.sumTime')" align="center" prop="totalRunTime" :formatter="erpPriceTableColumnFormatter" width="240"/>
-        <el-table-column :label="t('operationFillForm.sumKil')"  align="center" prop="totalMileage" :formatter="erpPriceTableColumnFormatter"/>
+        <el-table-column :label="t('operationFillForm.sumTime')" align="center" prop="totalRunTime" :formatter="erpPriceTableColumnFormatter" width="240">
+          <template #default="{ row }">
+            {{ row.totalRunTime ?? row.tempTotalRunTime }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="t('operationFillForm.sumKil')"  align="center" prop="totalMileage" :formatter="erpPriceTableColumnFormatter">
+          <template #default="{ row }">
+            {{ row.totalMileage ?? row.tempTotalMileage }}
+          </template>
+        </el-table-column>
         <el-table-column label="保养项" align="center" prop="name" />
         <el-table-column :label="t('main.mileage')"  key="mileageRule" width="80">
           <template #default="scope">
@@ -518,6 +503,10 @@ const formData = ref({
   name: '',
   orderNumber: undefined,
   responsiblePerson: undefined,
+  actualStartTime: undefined,
+  actualEndTime: undefined,
+  cost: undefined,
+  otherCost: undefined,
   outsourcingFlag: 0,
   type: undefined,
   result: undefined,