Merge remote-tracking branch 'origin/master'

src/api/pms/iotmaintenancebom/index.ts

@@ -45,31 +45,37 @@ export interface IotMaintenanceBomVO {
 export const IotMaintenanceBomApi = {
   // 查询PMS 保养计划明细BOM分页
   getIotMaintenanceBomPage: async (params: any) => {
-    return await request.get({ url: `/rq/iot-maintenance-bom/page`, params })
+    return await request.get({ url: `/pms/iot-maintenance-bom/page`, params })
   },
 
   // 查询PMS 保养计划明细BOM详情
   getIotMaintenanceBom: async (id: number) => {
-    return await request.get({ url: `/rq/iot-maintenance-bom/get?id=` + id })
+    return await request.get({ url: `/pms/iot-maintenance-bom/get?id=` + id })
   },
 
   // 新增PMS 保养计划明细BOM
   createIotMaintenanceBom: async (data: any) => {
-    return await request.post({ url: `/rq/iot-maintenance-bom/create`, data })
+    return await request.post({ url: `/pms/iot-maintenance-bom/create`, data })
   },
 
   // 修改PMS 保养计划明细BOM
   updateIotMaintenanceBom: async (data: IotMaintenanceBomVO) => {
-    return await request.put({ url: `/rq/iot-maintenance-bom/update`, data })
+    return await request.put({ url: `/pms/iot-maintenance-bom/update`, data })
   },
 
   // 删除PMS 保养计划明细BOM
   deleteIotMaintenanceBom: async (id: number) => {
-    return await request.delete({ url: `/rq/iot-maintenance-bom/delete?id=` + id })
+    return await request.delete({ url: `/pms/iot-maintenance-bom/delete?id=` + id })
   },
 
   // 导出PMS 保养计划明细BOM Excel
   exportIotMaintenanceBom: async (params) => {
-    return await request.download({ url: `/rq/iot-maintenance-bom/export-excel`, params })
+    return await request.download({ url: `/pms/iot-maintenance-bom/export-excel`, params })
   },
+
+  // 获得PMS 保养工单明细BOM列表
+  getMainPlanBOMs: async (params: any) => {
+    return await request.get({ url: `/pms/iot-maintenance-bom/getMainPlanBOMs`, params })
+  },
+
 }

src/views/pms/maintenance/IotMaintenancePlanDetail.vue

@@ -80,6 +80,7 @@
               v-model="scope.row.mileageRule"
               :active-value="0"
               :inactive-value="1"
+              disabled
             />
           </template>
         </el-table-column>
@@ -96,6 +97,7 @@
               v-model="scope.row.runningTimeRule"
               :active-value="0"
               :inactive-value="1"
+              disabled
             />
           </template>
         </el-table-column>
@@ -112,6 +114,7 @@
               v-model="scope.row.naturalDateRule"
               :active-value="0"
               :inactive-value="1"
+              disabled
             />
           </template>
         </el-table-column>
@@ -126,6 +129,7 @@
           <template #default="scope">
             <div style="display: flex; justify-content: center; align-items: center; width: 100%">
               <div>
+                <!--
                 <Icon style="vertical-align: middle; color: #ea3434" icon="ep:zoom-out" />
                 <el-button
                   style="vertical-align: middle"
@@ -135,6 +139,7 @@
                 >
                   移除
                 </el-button>
+                -->
               </div>
               <!-- 新增配置按钮 -->
               <div style="margin-left: 12px">
@@ -155,7 +160,6 @@
   <ContentWrap>
     <el-form>
       <el-form-item style="float: right">
-        <el-button @click="submitForm" type="primary" :disabled="formLoading">保 存</el-button>
         <el-button @click="close">取 消</el-button>
       </el-form-item>
     </el-form>
@@ -179,6 +183,7 @@
           :precision="2"
           :min="0"
           controls-position="right"
+          disabled
         />
       </el-form-item>
       <!-- 运行时间配置 -->
@@ -192,6 +197,7 @@
           :precision="1"
           :min="0"
           controls-position="right"
+          disabled
         />
       </el-form-item>
       <!-- 自然日期配置 -->
@@ -206,6 +212,7 @@
           placeholder="选择日期"
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
+          disabled
         />
       </el-form-item>
       <!-- 保养规则周期值 + 提前量 -->
@@ -219,6 +226,7 @@
           :precision="2"
           :min="0"
           controls-position="right"
+          disabled
         />
       </el-form-item>
       <el-form-item
@@ -231,6 +239,7 @@
           :precision="2"
           :min="0"
           controls-position="right"
+          disabled
         />
       </el-form-item>
       <el-form-item
@@ -243,6 +252,7 @@
           :precision="1"
           :min="0"
           controls-position="right"
+          disabled
         />
       </el-form-item>
       <el-form-item
@@ -255,6 +265,7 @@
           :precision="1"
           :min="0"
           controls-position="right"
+          disabled
         />
       </el-form-item>
       <el-form-item
@@ -266,6 +277,7 @@
           v-model="configDialog.form.nextNaturalDate"
           :min="0"
           controls-position="right"
+          disabled
         />
       </el-form-item>
       <el-form-item
@@ -277,12 +289,12 @@
           v-model="configDialog.form.naturalDatePeriodLead"
           :min="0"
           controls-position="right"
+          disabled
         />
       </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="configDialog.visible = false">取消</el-button>
-      <el-button type="primary" @click="saveConfig">保存</el-button>
     </template>
   </el-dialog>
 
@@ -301,7 +313,6 @@ import MainPlanDeviceList from "@/views/pms/maintenance/MainPlanDeviceList.vue";
 import * as DeptApi from "@/api/system/dept";
 import {erpPriceTableColumnFormatter} from "@/utils";
 import dayjs from 'dayjs'
-import {IotMainWorkOrderBomApi} from "@/api/pms/iotmainworkorderbom";
 
 /** 保养计划 表单 */
 defineOptions({ name: 'IotMaintenancePlanDetail' })
@@ -443,7 +454,7 @@ const saveConfig = () => {
 }
 
 const queryParams = reactive({
-  deviceIds: undefined
+  planId: id
 })
 
 const deviceChoose = async(selectedDevices) => {
@@ -699,7 +710,15 @@ onMounted(async () => {
     formData.value.responsiblePerson = res.nickname;
   })
   // 查询保养计划明细
-  // const data = await IotMaintenanceBomApi.getWorkOrderBOMs(queryParams);
+  const data = await IotMaintenanceBomApi.getMainPlanBOMs(queryParams);
+  list.value = []
+  if (Array.isArray(data)) {
+    list.value = data.map(item => ({
+      ...item,
+      // 这里可以添加必要的字段转换（如果有日期等需要格式化的字段）
+      lastNaturalDate: item.lastNaturalDate ? dayjs(item.lastNaturalDate).format('YYYY-MM-DD') : null
+    }))
+  }
   /* } else {
     formType.value = 'create';
     const { wsCache } = useCache()