pms 保养计划明细 功能优化

src/api/pms/iotmaintenancebom/index.ts

@@ -13,10 +13,13 @@ export interface IotMaintenanceBomVO {
   runningTimeRule: number   // 保养规则-运行时间(0启用 1停用)
   lastRunningTime: number // 上次保养运行时长(小时)
   nextRunningTime: number // 下次保养运行时长(小时)
+  timePeriodLead: number  // 运行时长周期提前量 H
   lastRunningKilometers: number // 上次保养运行公里数(千米)
   nextRunningKilometers: number // 下次保养运行公里数(千米)
-  lastNaturalDate: number // 上次保养自然日期(天)
+  kiloCycleLead: number // 公里数周期-提前量 km
+  lastNaturalDate: Date // 上次保养自然日期(天)
   nextNaturalDate: number // 下次保养自然日期(天)
+  naturalDatePeriodLead: number // 自然日周期-提前量(天)
   bomNodeId: number // bom节点id
   name: string // BOM名称
   code: string // BOM编码

src/api/pms/iotmainworkorderbom/index.ts

@@ -17,7 +17,7 @@ export interface IotMainWorkOrderBomVO {
   delayDuration: number // 推迟运行时长(小时)
   lastRunningKilometers: number // 上次保养运行公里数(千米)
   nextRunningKilometers: number // 下次保养运行公里数(千米)
-  delayKilomaters: number // 推迟运行公里数(千米)
+  delayKilometers: number // 推迟运行公里数(千米)
   lastNaturalDate: number // 上次保养自然日期(天)
   nextNaturalDate: number // 下次保养自然日期(天)
   delayNaturalDate: number // 推迟自然日期(天)
@@ -28,7 +28,7 @@ export interface IotMainWorkOrderBomVO {
   kilometerCycle: number // 公里数周期(千米)
   kiloCycleLead: number // 公里数周期-提前量(千米)
   naturalDatePeriod: number // 自然日周期(天)
-  naturalDatePeroidLead: number // 自然日周期-提前量(天)
+  naturalDatePeriodLead: number // 自然日周期-提前量(天)
   bomNodeId: number // BOM节点id
   name: string // BOM名称
   code: string // BOM编码

src/utils/dict.ts

@@ -265,4 +265,5 @@ export enum DICT_TYPE {
 
   // ========== PMS模块  ==========
   PMS_BOM_NODE_EXT_ATTR = 'BOM_NODE_EXT_ATTR', // BOM节点扩展属性 维护 or 保养
+  PMS_MAIN_WORK_ORDER_TYPE = 'pms_main_work_order_type', // 保养工单类型
 }

src/views/pms/iotmainworkorder/index.vue

@@ -8,182 +8,28 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="保养计划id" prop="planId">
-        <el-input
-          v-model="queryParams.planId"
-          placeholder="请输入保养计划id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="保养计划编号" prop="planSerialNumber">
-        <el-input
-          v-model="queryParams.planSerialNumber"
-          placeholder="请输入保养计划编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="组织id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入组织id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="工单号" prop="orderNumber">
-        <el-input
-          v-model="queryParams.orderNumber"
-          placeholder="请输入工单号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="工单名称 (吐哈-C14-保养计划)" prop="name">
+      <el-form-item label="工单名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入工单名称 (吐哈-C14-保养计划)"
+          placeholder="请输入工单名称"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="工单类型(1计划生成  2临时新建)" prop="type">
-        <el-select
-          v-model="queryParams.type"
-          placeholder="请选择工单类型(1计划生成  2临时新建)"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="负责人id 多个以逗号分隔" prop="responsiblePerson">
-        <el-input
-          v-model="queryParams.responsiblePerson"
-          placeholder="请输入负责人id 多个以逗号分隔"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="负责人id 多个以逗号分隔" prop="responsiblePersonName">
-        <el-input
-          v-model="queryParams.responsiblePersonName"
-          placeholder="请输入负责人id 多个以逗号分隔"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="保养费用" prop="cost">
-        <el-input
-          v-model="queryParams.cost"
-          placeholder="请输入保养费用"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="保养结果(1待执行 2已执行)" prop="result">
-        <el-input
-          v-model="queryParams.result"
-          placeholder="请输入保养结果(1待执行 2已执行)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="其他费用" prop="otherCost">
-        <el-input
-          v-model="queryParams.otherCost"
-          placeholder="请输入其他费用"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="人工费用" prop="laborCost">
-        <el-input
-          v-model="queryParams.laborCost"
-          placeholder="请输入人工费用"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="是否委外 0否  1是" prop="outsourcingFlag">
-        <el-input
-          v-model="queryParams.outsourcingFlag"
-          placeholder="请输入是否委外 0否  1是"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="实际保养开始时间" prop="actualStartTime">
-        <el-date-picker
-          v-model="queryParams.actualStartTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item label="实际保养结束时间" prop="actualEndTime">
-        <el-date-picker
-          v-model="queryParams.actualEndTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="状态 0启用  1停用" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态 0启用  1停用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="流程实例id" prop="processInstanceId">
-        <el-input
-          v-model="queryParams.processInstanceId"
-          placeholder="请输入流程实例id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="审批状态 未提交、审批中、审批通过、审批不通过、已取消" prop="auditStatus">
+      <el-form-item label="审批状态" prop="auditStatus">
         <el-select
           v-model="queryParams.auditStatus"
-          placeholder="请选择审批状态 未提交、审批中、审批通过、审批不通过、已取消"
+          placeholder="请选择审批状态"
           clearable
           class="!w-240px"
         >
-          <el-option label="请选择字典生成" value="" />
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.CRM_AUDIT_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
@@ -224,20 +70,14 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="保养计划id" align="center" prop="planId" />
-      <el-table-column label="保养计划编号" align="center" prop="planSerialNumber" />
-      <el-table-column label="组织id" align="center" prop="deptId" />
       <el-table-column label="工单号" align="center" prop="orderNumber" />
-      <el-table-column label="工单名称 (吐哈-C14-保养计划)" align="center" prop="name" />
-      <el-table-column label="工单类型(1计划生成  2临时新建)" align="center" prop="type" />
-      <el-table-column label="负责人id 多个以逗号分隔" align="center" prop="responsiblePerson" />
-      <el-table-column label="负责人id 多个以逗号分隔" align="center" prop="responsiblePersonName" />
-      <el-table-column label="保养费用" align="center" prop="cost" />
-      <el-table-column label="保养结果(1待执行 2已执行)" align="center" prop="result" />
-      <el-table-column label="其他费用" align="center" prop="otherCost" />
-      <el-table-column label="人工费用" align="center" prop="laborCost" />
-      <el-table-column label="是否委外 0否  1是" align="center" prop="outsourcingFlag" />
+      <el-table-column label="工单名称" align="center" prop="name" />
+      <el-table-column label="工单类型" align="center" prop="type" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PMS_MAIN_WORK_ORDER_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="负责人" align="center" prop="responsiblePersonName" />
       <el-table-column
         label="实际保养开始时间"
         align="center"
@@ -252,10 +92,6 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="状态 0启用  1停用" align="center" prop="status" />
-      <el-table-column label="流程实例id" align="center" prop="processInstanceId" />
-      <el-table-column label="审批状态 未提交、审批中、审批通过、审批不通过、已取消" align="center" prop="auditStatus" />
       <el-table-column
         label="创建时间"
         align="center"
@@ -302,6 +138,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { IotMainWorkOrderApi, IotMainWorkOrderVO } from '@/api/pms/iotmainworkorder'
 import IotMainWorkOrderForm from './IotMainWorkOrderForm.vue'
+import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
 
 /** 保养工单 列表 */
 defineOptions({ name: 'IotMainWorkOrder' })
@@ -401,4 +238,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
+</script>

src/views/pms/iotmainworkorderbom/IotMainWorkOrderBomForm.vue

@@ -112,8 +112,8 @@
       <el-form-item label="自然日周期(天)" prop="naturalDatePeriod">
         <el-input v-model="formData.naturalDatePeriod" placeholder="请输入自然日周期(天)" />
       </el-form-item>
-      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeroidLead">
-        <el-input v-model="formData.naturalDatePeroidLead" placeholder="请输入自然日周期-提前量(天)" />
+      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeriodLead">
+        <el-input v-model="formData.naturalDatePeriodLead" placeholder="请输入自然日周期-提前量(天)" />
       </el-form-item>
       <el-form-item label="BOM节点id" prop="bomNodeId">
         <el-input v-model="formData.bomNodeId" placeholder="请输入BOM节点id" />
@@ -193,10 +193,10 @@ const formData = ref({
   runningTimeRule: undefined,
   lastRunningTime: undefined,
   nextRunningTime: undefined,
-  delay duration: undefined,
+  delayDuration: undefined,
   lastRunningKilometers: undefined,
   nextRunningKilometers: undefined,
-  delayKilomaters: undefined,
+  delayKilometers: undefined,
   lastNaturalDate: undefined,
   nextNaturalDate: undefined,
   delayNaturalDate: undefined,
@@ -207,7 +207,7 @@ const formData = ref({
   kilometerCycle: undefined,
   kiloCycleLead: undefined,
   naturalDatePeriod: undefined,
-  naturalDatePeroidLead: undefined,
+  naturalDatePeriodLead: undefined,
   bomNodeId: undefined,
   name: undefined,
   code: undefined,
@@ -283,10 +283,10 @@ const resetForm = () => {
     runningTimeRule: undefined,
     lastRunningTime: undefined,
     nextRunningTime: undefined,
-    delay duration: undefined,
+    delayDuration: undefined,
     lastRunningKilometers: undefined,
     nextRunningKilometers: undefined,
-    delayKilomaters: undefined,
+    delayKilometers: undefined,
     lastNaturalDate: undefined,
     nextNaturalDate: undefined,
     delayNaturalDate: undefined,
@@ -297,7 +297,7 @@ const resetForm = () => {
     kilometerCycle: undefined,
     kiloCycleLead: undefined,
     naturalDatePeriod: undefined,
-    naturalDatePeroidLead: undefined,
+    naturalDatePeriodLead: undefined,
     bomNodeId: undefined,
     name: undefined,
     code: undefined,
@@ -314,4 +314,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
+</script>

src/views/pms/iotmainworkorderbom/index.vue

@@ -138,9 +138,9 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="推迟运行公里数(千米)" prop="delayKilomaters">
+      <el-form-item label="推迟运行公里数(千米)" prop="delayKilometers">
         <el-input
-          v-model="queryParams.delayKilomaters"
+          v-model="queryParams.delayKilometers"
           placeholder="请输入推迟运行公里数(千米)"
           clearable
           @keyup.enter="handleQuery"
@@ -245,9 +245,9 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeroidLead">
+      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeriodLead">
         <el-input
-          v-model="queryParams.naturalDatePeroidLead"
+          v-model="queryParams.naturalDatePeriodLead"
           placeholder="请输入自然日周期-提前量(天)"
           clearable
           @keyup.enter="handleQuery"
@@ -427,7 +427,7 @@
       <el-table-column label="推迟运行时长(小时)" align="center" prop="delayDuration" />
       <el-table-column label="上次保养运行公里数(千米)" align="center" prop="lastRunningKilometers" />
       <el-table-column label="下次保养运行公里数(千米)" align="center" prop="nextRunningKilometers" />
-      <el-table-column label="推迟运行公里数(千米)" align="center" prop="delayKilomaters" />
+      <el-table-column label="推迟运行公里数(千米)" align="center" prop="delayKilometers" />
       <el-table-column label="上次保养自然日期(天)" align="center" prop="lastNaturalDate" />
       <el-table-column label="下次保养自然日期(天)" align="center" prop="nextNaturalDate" />
       <el-table-column label="推迟自然日期(天)" align="center" prop="delayNaturalDate" />
@@ -444,7 +444,7 @@
       <el-table-column label="公里数周期(千米)" align="center" prop="kilometerCycle" />
       <el-table-column label="公里数周期-提前量(千米)" align="center" prop="kiloCycleLead" />
       <el-table-column label="自然日周期(天)" align="center" prop="naturalDatePeriod" />
-      <el-table-column label="自然日周期-提前量(天)" align="center" prop="naturalDatePeroidLead" />
+      <el-table-column label="自然日周期-提前量(天)" align="center" prop="naturalDatePeriodLead" />
       <el-table-column label="BOM节点id" align="center" prop="bomNodeId" />
       <el-table-column label="BOM名称" align="center" prop="name" />
       <el-table-column label="BOM编码" align="center" prop="code" />
@@ -531,7 +531,7 @@ const queryParams = reactive({
   delayDuration: undefined,
   lastRunningKilometers: undefined,
   nextRunningKilometers: undefined,
-  delayKilomaters: undefined,
+  delayKilometers: undefined,
   lastNaturalDate: [],
   nextNaturalDate: [],
   delayNaturalDate: [],
@@ -542,7 +542,7 @@ const queryParams = reactive({
   kilometerCycle: undefined,
   kiloCycleLead: undefined,
   naturalDatePeriod: undefined,
-  naturalDatePeroidLead: undefined,
+  naturalDatePeriodLead: undefined,
   bomNodeId: undefined,
   name: undefined,
   code: undefined,

src/views/pms/iotmainworkorderbommaterial/IotMainWorkOrderBomMaterialForm.vue

@@ -61,8 +61,8 @@
       <el-form-item label="自然日周期(天)" prop="naturalDatePeriod">
         <el-input v-model="formData.naturalDatePeriod" placeholder="请输入自然日周期(天)" />
       </el-form-item>
-      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeroidLead">
-        <el-input v-model="formData.naturalDatePeroidLead" placeholder="请输入自然日周期-提前量(天)" />
+      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeriodLead">
+        <el-input v-model="formData.naturalDatePeriodLead" placeholder="请输入自然日周期-提前量(天)" />
       </el-form-item>
       <el-form-item label="物料来源 (SAP库存 本地库存...)" prop="materialSource">
         <el-input v-model="formData.materialSource" placeholder="请输入物料来源 (SAP库存 本地库存...)" />
@@ -121,7 +121,7 @@ const formData = ref({
   timePeriod: undefined,
   timePeriodLead: undefined,
   naturalDatePeriod: undefined,
-  naturalDatePeroidLead: undefined,
+  naturalDatePeriodLead: undefined,
   materialSource: undefined,
   inventoryAddress: undefined,
   sort: undefined,
@@ -196,7 +196,7 @@ const resetForm = () => {
     timePeriod: undefined,
     timePeriodLead: undefined,
     naturalDatePeriod: undefined,
-    naturalDatePeroidLead: undefined,
+    naturalDatePeriodLead: undefined,
     materialSource: undefined,
     inventoryAddress: undefined,
     sort: undefined,
@@ -205,4 +205,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
+</script>

src/views/pms/iotmainworkorderbommaterial/index.vue

@@ -170,9 +170,9 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeroidLead">
+      <el-form-item label="自然日周期-提前量(天)" prop="naturalDatePeriodLead">
         <el-input
-          v-model="queryParams.naturalDatePeroidLead"
+          v-model="queryParams.naturalDatePeriodLead"
           placeholder="请输入自然日周期-提前量(天)"
           clearable
           @keyup.enter="handleQuery"
@@ -282,7 +282,7 @@
       <el-table-column label="时间周期(小时)" align="center" prop="timePeriod" />
       <el-table-column label="时间周期-提前量(小时)" align="center" prop="timePeriodLead" />
       <el-table-column label="自然日周期(天)" align="center" prop="naturalDatePeriod" />
-      <el-table-column label="自然日周期-提前量(天)" align="center" prop="naturalDatePeroidLead" />
+      <el-table-column label="自然日周期-提前量(天)" align="center" prop="naturalDatePeriodLead" />
       <el-table-column label="物料来源 (SAP库存 本地库存...)" align="center" prop="materialSource" />
       <el-table-column label="库存地点" align="center" prop="inventoryAddress" />
       <el-table-column label="排序" align="center" prop="sort" />
@@ -365,7 +365,7 @@ const queryParams = reactive({
   timePeriod: undefined,
   timePeriodLead: undefined,
   naturalDatePeriod: undefined,
-  naturalDatePeroidLead: undefined,
+  naturalDatePeriodLead: undefined,
   materialSource: undefined,
   inventoryAddress: undefined,
   sort: undefined,
@@ -438,4 +438,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
+</script>