Merge remote-tracking branch 'origin/master'

src/api/pms/iotmaterialrequisition/index.ts

@@ -1,54 +1,59 @@
-import request from '@/config/axios'
-
-// 物料领用 VO
-export interface IotMaterialRequisitionVO {
-  id: number // 主键id
-  deptId: number // 部门id
-  requisitionNumber: string // 物料领用单编号
-  name: string // 物料领用单名称
-  type: number // 领用用途(1维修  2保养 3其它)
-  responsiblePerson: string // 领用人姓名
-  cost: number // 物料总费用
-  result: number // 领用结果(1待执行 2已执行)
-  otherCost: number // 其他费用
-  laborCost: number // 人工费用
-  requisitionTime: Date // 领用日期
-  reason: string // 领用原因
-  remark: string // 备注（如特殊要求、紧急程度）
-  status: number // 状态 0=未出库 1=已出库 2=已关闭
-  processInstanceId: string // 流程实例id
-  auditStatus: number // 审批状态 未提交、审批中、审批通过、审批不通过、已取消
-}
-
-// 物料领用 API
-export const IotMaterialRequisitionApi = {
-  // 查询物料领用分页
-  getIotMaterialRequisitionPage: async (params: any) => {
-    return await request.get({ url: `/pms/iot-material-requisition/page`, params })
-  },
-
-  // 查询物料领用详情
-  getIotMaterialRequisition: async (id: number) => {
-    return await request.get({ url: `/pms/iot-material-requisition/get?id=` + id })
-  },
-
-  // 新增物料领用
-  createIotMaterialRequisition: async (data: IotMaterialRequisitionVO) => {
-    return await request.post({ url: `/pms/iot-material-requisition/create`, data })
-  },
-
-  // 修改物料领用
-  updateIotMaterialRequisition: async (data: IotMaterialRequisitionVO) => {
-    return await request.put({ url: `/pms/iot-material-requisition/update`, data })
-  },
-
-  // 删除物料领用
-  deleteIotMaterialRequisition: async (id: number) => {
-    return await request.delete({ url: `/pms/iot-material-requisition/delete?id=` + id })
-  },
-
-  // 导出物料领用 Excel
-  exportIotMaterialRequisition: async (params) => {
-    return await request.download({ url: `/pms/iot-material-requisition/export-excel`, params })
-  },
-}
+import request from '@/config/axios'
+
+// 物料领用 VO
+export interface IotMaterialRequisitionVO {
+  id: number // 主键id
+  deptId: number // 部门id
+  requisitionNumber: string // 物料领用单编号
+  name: string // 物料领用单名称
+  type: number // 领用用途(1维修  2保养 3其它)
+  responsiblePerson: string // 领用人姓名
+  cost: number // 物料总费用
+  result: number // 领用结果(1待执行 2已执行)
+  otherCost: number // 其他费用
+  laborCost: number // 人工费用
+  requisitionTime: Date // 领用日期
+  reason: string // 领用原因
+  remark: string // 备注（如特殊要求、紧急程度）
+  status: number // 状态 0=未出库 1=已出库 2=已关闭
+  processInstanceId: string // 流程实例id
+  auditStatus: number // 审批状态 未提交、审批中、审批通过、审批不通过、已取消
+}
+
+// 物料领用 API
+export const IotMaterialRequisitionApi = {
+  // 查询物料领用分页
+  getIotMaterialRequisitionPage: async (params: any) => {
+    return await request.get({ url: `/pms/iot-material-requisition/page`, params })
+  },
+
+  // 查询物料领用详情
+  getIotMaterialRequisition: async (id: number) => {
+    return await request.get({ url: `/pms/iot-material-requisition/get?id=` + id })
+  },
+
+  // 新增物料领用
+  createIotMaterialRequisition: async (data: IotMaterialRequisitionVO) => {
+    return await request.post({ url: `/pms/iot-material-requisition/create`, data })
+  },
+
+  // 新增物料领用单
+  addMaterialRequisition: async (data: any) => {
+    return await request.put({ url: `/pms/iot-material-requisition/addMaterialRequisition`, data })
+  },
+
+  // 修改物料领用
+  updateIotMaterialRequisition: async (data: IotMaterialRequisitionVO) => {
+    return await request.put({ url: `/pms/iot-material-requisition/update`, data })
+  },
+
+  // 删除物料领用
+  deleteIotMaterialRequisition: async (id: number) => {
+    return await request.delete({ url: `/pms/iot-material-requisition/delete?id=` + id })
+  },
+
+  // 导出物料领用 Excel
+  exportIotMaterialRequisition: async (params) => {
+    return await request.download({ url: `/pms/iot-material-requisition/export-excel`, params })
+  },
+}

src/api/pms/iotmaterialrequisitiondetail/index.ts

@@ -4,6 +4,8 @@ import request from '@/config/axios'
 export interface IotMaterialRequisitionDetailVO {
   id: number // 主键
   requisitionId: number // 物料领用单id
+  factoryId: number     // 工厂id
+  costCenterId: number  // 成本中心id
   materialId: number // 物料id
   materialCode: string // 物料编码
   materialName: string // 物料名称
@@ -25,6 +27,11 @@ export const IotMaterialRequisitionDetailApi = {
     return await request.get({ url: `/pms/iot-material-requisition-detail/page`, params })
   },
 
+  // 查询PMS 物料领用明细列表
+  getIotMaterialRequisitionDetailList: async (params: any) => {
+    return await request.get({ url: `/pms/iot-material-requisition-detail/list`, params })
+  },
+
   // 查询PMS 物料领用明细详情
   getIotMaterialRequisitionDetail: async (id: number) => {
     return await request.get({ url: `/pms/iot-material-requisition-detail/get?id=` + id })

src/api/pms/iotprojectinfo/index.ts

@@ -0,0 +1,55 @@
+import request from '@/config/axios'
+import {RouteParamValue} from "vue-router";
+
+// 项目信息 VO
+export interface IotProjectInfoVO {
+  id: number // 主键id
+  deptId: number // 组织id
+  deptName: string // 部门名称
+  contractName: string // 合同名称
+  contractCode: number // 合同编号
+  workloadTotal: string // 工作量总数
+  workloadFinish: string // 工作量已完成
+  startTime: Date // 开始时间
+  endTime: Date // 完成时间
+  location: string // 施工地点
+  technique: string // 施工工艺
+  payment: string // 施工工艺
+  userName: string // 用户名
+  userId: number // 用户id
+  manufacturerId:number
+  manufactureName:string
+}
+
+// 项目信息 API
+export const IotProjectInfoApi = {
+  // 查询项目信息分页
+  getIotProjectInfoPage: async (params: any) => {
+    return await request.get({ url: `/rq/iot-project-info/page`, params })
+  },
+
+  // 查询项目信息详情
+  getIotProjectInfo: async (id: string | RouteParamValue[]) => {
+    return await request.get({ url: `/rq/iot-project-info/get?id=` + id })
+  },
+
+  // 新增项目信息
+  createIotProjectInfo: async (data: any) => {
+    return await request.post({ url: `/rq/iot-project-info/create`, data })
+  },
+
+  // 修改项目信息
+  updateIotProjectInfo: async (data: any) => {
+    return await request.put({ url: `/rq/iot-project-info/update`, data })
+  },
+
+  // 删除项目信息
+  deleteIotProjectInfo: async (id: number) => {
+    return await request.delete({ url: `/rq/iot-project-info/delete?id=` + id })
+  },
+
+  // 导出项目信息 Excel
+  exportIotProjectInfo: async (params) => {
+    return await request.download({ url: `/rq/iot-project-info/export-excel`, params })
+  },
+}

src/api/pms/iotprojecttask/index.ts

@@ -0,0 +1,49 @@
+import request from '@/config/axios'
+
+// 项目信息任务拆分 VO
+export interface IotProjectTaskVO {
+  id: number // 主键id
+  projectId: number // 项目id
+  wellName: string // 井号
+  wellType: string // 井型/井别
+  location: string // 施工地点
+  technique: string // 施工工艺
+  workloadDesign: string // 设计工作量
+  userName: string // 用户名
+  userId: number // 用户id
+  remark: string // 备注
+  deptIds:[]
+}
+
+// 项目信息任务拆分 API
+export const IotProjectTaskApi = {
+  // 查询项目信息任务拆分分页
+  getIotProjectTaskPage: async (params: any) => {
+    return await request.get({ url: `/rq/iot-project-task/page`, params })
+  },
+
+  // 查询项目信息任务拆分详情
+  getIotProjectTask: async (id: number) => {
+    return await request.get({ url: `/rq/iot-project-task/get?id=` + id })
+  },
+
+  // 新增项目信息任务拆分
+  createIotProjectTask: async (data: IotProjectTaskVO) => {
+    return await request.post({ url: `/rq/iot-project-task/create`, data })
+  },
+
+  // 修改项目信息任务拆分
+  updateIotProjectTask: async (data: IotProjectTaskVO) => {
+    return await request.put({ url: `/rq/iot-project-task/update`, data })
+  },
+
+  // 删除项目信息任务拆分
+  deleteIotProjectTask: async (id: number) => {
+    return await request.delete({ url: `/rq/iot-project-task/delete?id=` + id })
+  },
+
+  // 导出项目信息任务拆分 Excel
+  exportIotProjectTask: async (params) => {
+    return await request.download({ url: `/rq/iot-project-task/export-excel`, params })
+  },
+}

src/router/modules/remaining.ts

@@ -121,6 +121,28 @@ const remainingRouter: AppRouteRecordRaw[] = [
       }
     ]
   },
+  {
+    path: '/iotProjectInfo',
+    component: Layout,
+    name: 'IotProjectInfo',
+    meta: {
+      hidden: true
+    },
+    children: [
+      {
+        path: 'project/info/:type/:id?(\\d+)',
+        component: () => import('@/views/pms/iotprojectinfo/IotProjectInfoForm.vue'),
+        name: 'IotProjectInfo',
+        meta: {
+          title: '添加项目信息',
+          noCache: false,
+          hidden: true,
+          canTo: true,
+          activeMenu: '/project/info'
+        }
+      }
+    ]
+  },
   {
     path: '/fillOrderInfo',
     component: Layout,
@@ -565,6 +587,19 @@ const remainingRouter: AppRouteRecordRaw[] = [
           activeMenu: '/materialreq/add'
         }
       },
+      {
+        path: 'materialreq/detail/:id(\\d+)',
+        component: () => import('@/views/pms/iotmaterialrequisition/IotMaterialReqDetail.vue'),
+        name: 'IotMaterialReqDetail',
+        meta: {
+          noCache: false,
+          hidden: true,
+          canTo: true,
+          icon: 'ep:view',
+          title: '领用单详情',
+          activeMenu: '/materialreq/detail'
+        }
+      },
     ]
   },
 

src/views/pms/iotmainworkorder/IotMainWorkOrderAdd.vue

@@ -938,14 +938,6 @@ onMounted(async () => {
 })
 
 const handleDelete = async (str: string) => {
-  /* try {
-    const index = list.value.findIndex((item) => (item.deviceId+'-'+item.bomNodeId) === str)
-    if (index !== -1) {
-      // 通过 splice 删除元素
-      list.value.splice(index, 1)
-      deviceIds.value = []
-    }
-  } catch {} */
   try {
     const [deviceIdStr, bomNodeId] = str.split('-')
     const deviceId = parseInt(deviceIdStr)
@@ -962,7 +954,6 @@ const handleDelete = async (str: string) => {
       devicePersonsMap.value.delete(deviceId) // 移除对应设备的责任人
       updateDevicePersonsDisplay() // 立即更新显示
     }
-    // message.success('移除成功')
   } catch (error) {
     console.error('移除失败:', error)
     message.error('移除失败')

src/views/pms/iotmainworkorder/IotMainWorkOrderDetail.vue

@@ -899,10 +899,8 @@ onMounted(async () => {
   const deptId = useUserStore().getUser.deptId
   // 查询当前登录人所属部门名称
   dept.value = await DeptApi.getDept(deptId)
-  // formData.value.name = dept.value.name + ' - 保养计划'
   deptUsers.value = await UserApi.getDeptUsersByDeptId(deptId)
   formData.value.deptId = deptId
-  // if (id){
   try{
     formType.value = 'update'
     // 查询保养工单 主表数据

src/views/pms/iotmaterialrequisition/IotMaterialReqDetail.vue

@@ -0,0 +1,370 @@
+<template>
+  <ContentWrap v-loading="formLoading">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      v-loading="formLoading"
+      style="margin-right: 4em; margin-left: 0.5em; margin-top: 1em"
+      label-width="130px"
+    >
+      <div class="base-expandable-content">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="领料单名称" prop="name">
+              <el-input type="text" v-model="formData.name" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="费用" prop="cost">
+              <el-input
+                v-model="formData.cost"
+                placeholder="根据领用物料自动生成"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="领用日期" prop="actualStartTime">
+              <el-date-picker
+                style="width: 150%"
+                v-model="formData.requisitionTime"
+                type="datetime"
+                value-format="x"
+                placeholder="实际保养开始时间"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="领用人" prop="otherCost">
+              <el-input
+                v-model="formData.responsiblePerson"
+                placeholder="请输入领用人"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="领用原因" prop="remark">
+              <el-input v-model="formData.reason" type="textarea" placeholder="请输入领用原因" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" disabled/>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </div>
+    </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="materialList" :stripe="true" :show-overflow-tooltip="true">
+        <!-- 添加序号列 -->
+        <el-table-column
+          type="index"
+          label="序号"
+          width="60"
+          align="center"
+        />
+        <el-table-column label="工厂" align="center" prop="factory" />
+        <el-table-column label="成本中心" align="center" prop="costCenter" />
+        <el-table-column label="物料编码" align="center" prop="materialCode" />
+        <el-table-column label="物料名称" align="center" prop="materialName" />
+        <el-table-column label="单价" align="center" prop="unitPrice" :formatter="erpPriceTableColumnFormatter"/>
+        <el-table-column label="库存数量" align="center" prop="quantity" :formatter="erpPriceTableColumnFormatter"/>
+        <el-table-column label="领用数量" align="center" prop="requisitionQuantity" :formatter="erpPriceTableColumnFormatter"/>
+        <el-table-column label="单位" align="center" prop="unit" />
+      </el-table>
+    </ContentWrap>
+
+  </ContentWrap>
+  <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>
+  </ContentWrap>
+  <SelectLocalStock ref="localStockFormRef" @choose="stockChoose" />
+</template>
+<script setup lang="ts">
+import * as UserApi from '@/api/system/user'
+import { useUserStore } from '@/store/modules/user'
+import { ref } from 'vue'
+import { IotMaterialRequisitionApi, IotMaterialRequisitionVO } from '@/api/pms/iotmaterialrequisition'
+import { IotMaterialRequisitionDetailApi, IotMaterialRequisitionDetailVO } from '@/api/pms/iotmaterialrequisitiondetail'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
+import SelectLocalStock from "@/views/pms/iotmaterialrequisition/SelectLocalStock.vue";
+import * as DeptApi from "@/api/system/dept";
+import {erpPriceTableColumnFormatter} from "@/utils";
+
+/** 物料领用 表单 */
+defineOptions({ name: 'IotMaterialRequisitionAdd' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const { delView } = useTagsViewStore() // 视图操作
+const { currentRoute, push } = useRouter()
+const dept = ref() // 当前登录人所属部门对象
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const materialList = ref<IotMaterialRequisitionDetailVO[]>([]) // 领用单明细
+const { params, name } = useRoute() // 查询参数
+const id = params.id
+
+const formData = ref({
+  id: undefined,
+  deptId: undefined,
+  name: '',
+  orderNumber: undefined,
+  responsiblePerson: undefined,
+  requisitionTime: undefined,
+  cost: undefined,
+  reason: undefined,
+  remark: undefined,
+  status: undefined,
+})
+
+const formRules = reactive({
+  name: [{ required: true, message: '工单名称不能为空', trigger: 'blur' }],
+  responsiblePerson: [{ required: true, message: '领用人不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+// 监听物料列表变化
+watch(
+  () => materialList.value,
+  () => {
+    calculateTotalCost()
+  },
+  { deep: true }
+)
+
+const localStockFormRef = ref()
+const openForm = () => {
+  localStockFormRef.value.open()
+}
+
+// 计算保养金额
+const calculateTotalCost = () => {
+  // 物料总金额 = ∑(单价 * 消耗数量)
+  const materialTotal = materialList.value.reduce((sum, item) => {
+    const price = Number(item.unitPrice) || 0
+    const quantity = Number(item.requisitionQuantity) || 0
+    return sum + (price * quantity)
+  }, 0)
+
+  // 费用 = 物料总金额
+  formData.value.cost = (materialTotal).toFixed(2)
+}
+
+// 多选 物料
+const stockChoose = (selectedStocks) => {
+  // 转换数据结构（根据你的接口定义调整）
+  const newItems = selectedStocks.map(stock => ({
+    id: stock.id,
+    materialCode: stock.materialCode,
+    materialName: stock.materialName,
+    unit: stock.unit,
+    quantity: stock.quantity,        // 库存数量
+    requisitionQuantity: stock.requisitionQuantity,   // 领用数量
+    unitPrice: stock.unitPrice,      // 单价
+    remark: null,
+    code: stock.materialCode  // 移除操作需要
+  }))
+
+  // 合并到现有列表（去重）
+  newItems.forEach(item => {
+    const exists = materialList.value.some(
+      existing => existing.materialCode === item.materialCode
+    )
+    if (!exists) {
+      materialList.value.push(item)
+    }
+  })
+}
+
+const handleInput = (value, obj) => {
+  // 1. 过滤非法字符（只允许数字和小数点）
+  let filtered = value.replace(/[^\d.]/g, '')
+
+  // 2. 处理多个小数点的情况
+  filtered = filtered.replace(/\.{2,}/g, '.')
+
+  // 3. 限制小数点后最多两位
+  let decimalParts = filtered.split('.')
+  if (decimalParts.length > 1) {
+    decimalParts = decimalParts.slice(0, 2)
+    filtered = decimalParts.join('.')
+  }
+
+  // 4. 处理以小数点开头的情况（自动补0）
+  if (filtered.startsWith('.')) {
+    filtered = '0' + filtered
+  }
+
+  // 5. 更新绑定值（同时处理连续输入多个0的情况）
+  formData.value[obj] = filtered.replace(/^0+(?=\d)/, '')
+}
+
+const queryParams = reactive({
+  requisitionId: id,
+})
+
+const close = () => {
+  delView(unref(currentRoute))
+  push({ name: 'IotMaterialRequisition', params:{}})
+}
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 校验表格数据
+  const isValid = validateTableData()
+  if (!isValid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = {
+      materialRequisition: formData.value,
+      materialReqDetails: materialList.value
+    }
+    await IotMaterialRequisitionApi.addMaterialRequisition(data)
+    message.success(t('common.createSuccess'))
+    close()
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 校验表格数据 */
+const validateTableData = (): boolean => {
+  let isValid = true
+  const errorMessages: string[] = []
+
+  if (materialList.value.length === 0) {
+    errorMessages.push('请至少添加一条物料明细')
+    isValid = false
+    // 直接返回无需后续校验
+    message.error('请至少添加一条物料明细')
+    return isValid
+  }
+  return isValid
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    status: undefined,
+    description: undefined,
+    pic: undefined,
+    remark: undefined,
+    deviceName: undefined,
+    processInstanceId: undefined,
+    auditStatus: undefined,
+    deptId: undefined
+  }
+  formRef.value?.resetFields()
+}
+onMounted(async () => {
+  materialList.value = []
+  const deptId = useUserStore().getUser.deptId
+  // 查询当前登录人所属部门名称
+  dept.value = await DeptApi.getDept(deptId)
+  formData.value.name = dept.value.name + ' - 领料单'
+  formData.value.deptId = deptId
+  try {
+    // 领料单主表数据
+    const requisition = await IotMaterialRequisitionApi.getIotMaterialRequisition(id);
+    formData.value = requisition;
+    // 查询领料单物料明细
+    const requisitionDetails = await IotMaterialRequisitionDetailApi.getIotMaterialRequisitionDetailList(queryParams);
+    materialList.value = []
+    if (Array.isArray(requisitionDetails)) {
+      materialList.value = requisitionDetails.map(item => ({
+        ...item,
+      }))
+    }
+  } catch (error) {
+    console.error('数据加载失败:', error)
+    message.error('数据加载失败，请重试')
+  }
+})
+
+const handleDelete = async (materialCode: string) => {
+  try {
+    // 从 materialList 中移除对应物料
+    const index = materialList.value.findIndex(item => item.materialCode === materialCode);
+    if (index !== -1) {
+      materialList.value.splice(index, 1);
+      calculateTotalCost(); // 重新计算总费用
+    }
+  } catch (error) {
+    console.error('移除失败:', error);
+    message.error('移除失败');
+  }
+}
+
+</script>
+<style scoped>
+.base-expandable-content {
+  overflow: hidden; /* 隐藏溢出的内容 */
+  transition: max-height 0.3s ease; /* 平滑过渡效果 */
+}
+
+:deep(.el-input-number .el-input__inner) {
+  text-align: left !important;
+  padding-left: 10px; /* 保持左侧间距 */
+}
+
+/* 分组容器样式 */
+.form-group {
+  position: relative;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  padding: 20px 15px 10px;
+  margin-bottom: 18px;
+  transition: border-color 0.2s;
+}
+
+/* 分组标题样式 */
+.group-title {
+  position: absolute;
+  top: -10px;
+  left: 20px;
+  background: white;
+  padding: 0 8px;
+  color: #606266;
+  font-size: 12px;
+  font-weight: 500;
+}
+</style>

src/views/pms/iotmaterialrequisition/IotMaterialRequisitionAdd.vue

@@ -85,6 +85,10 @@
           width="60"
           align="center"
         />
+        <el-table-column label="工厂id" align="center" prop="factoryId" v-if="false"/>
+        <el-table-column label="成本中心id" align="center" prop="costCenterId" v-if="false"/>
+        <el-table-column label="工厂" align="center" prop="factory" v-if="true"/>
+        <el-table-column label="成本中心" align="center" prop="costCenter" v-if="true"/>
         <el-table-column label="物料编码" align="center" prop="materialCode" />
         <el-table-column label="物料名称" align="center" prop="materialName" />
         <el-table-column label="单价" align="center" prop="unitPrice" :formatter="erpPriceTableColumnFormatter"/>
@@ -100,7 +104,7 @@
                   style="vertical-align: middle"
                   link
                   type="danger"
-                  @click="handleDelete(scope.row.deviceId+'-'+scope.row.bomNodeId)"
+                  @click="handleDelete(scope.row.materialCode)"
                 >
                   移除
                 </el-button>
@@ -120,39 +124,19 @@
       </el-form-item>
     </el-form>
   </ContentWrap>
-  <MainPlanDeviceList ref="deviceFormRef" @choose="deviceChoose" />
   <SelectLocalStock ref="localStockFormRef" @choose="stockChoose" />
-  <!-- 表单弹窗：添加/修改 -->
-  <WorkOrderMaterial ref="materialFormRef" @choose="selectChoose" />
-  <!-- 抽屉组件 展示已经选择的物料 并编辑物料消耗 -->
-  <MaterialListDrawer
-    :model-value="drawerVisible"
-    @update:model-value="val => drawerVisible = val"
-    :node-id="currentBomNodeId"
-    :materials="materialList.filter(item => item.bomNodeId === currentBomNodeId)"
-  />
 </template>
 <script setup lang="ts">
-import { IotDeviceApi, IotDeviceVO } from '@/api/pms/device'
 import * as UserApi from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
 import { ref } from 'vue'
-import type { ComponentPublicInstance } from 'vue'
-import { IotMaintenanceBomApi, IotMaintenanceBomVO } from '@/api/pms/iotmaintenancebom'
-import { IotMainWorkOrderBomApi, IotMainWorkOrderBomVO } from '@/api/pms/iotmainworkorderbom'
-import { IotMainWorkOrderBomMaterialApi, IotMainWorkOrderBomMaterialVO } from '@/api/pms/iotmainworkorderbommaterial'
-import { IotMainWorkOrderApi, IotMainWorkOrderVO } from '@/api/pms/iotmainworkorder'
+import { IotMaterialRequisitionApi, IotMaterialRequisitionVO } from '@/api/pms/iotmaterialrequisition'
 import { IotMaterialRequisitionDetailApi, IotMaterialRequisitionDetailVO } from '@/api/pms/iotmaterialrequisitiondetail'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
-import MainPlanDeviceList from "@/views/pms/maintenance/MainPlanDeviceList.vue";
+import SelectLocalStock from "@/views/pms/iotmaterialrequisition/SelectLocalStock.vue";
 import * as DeptApi from "@/api/system/dept";
 import {erpPriceTableColumnFormatter} from "@/utils";
-import dayjs from 'dayjs'
-import MaterialListDrawer from "@/views/pms/iotmainworkorder/SelectedMaterialDrawer.vue";
-import WorkOrderMaterial from "@/views/pms/iotmainworkorder/WorkOrderMaterial.vue";
-import { IotDevicePersonApi, IotDevicePersonVO } from '@/api/pms/iotdeviceperson'
-import {DICT_TYPE, getIntDictOptions, getStrDictOptions} from "@/utils/dict";
 
 /** 物料领用 表单 */
 defineOptions({ name: 'IotMaterialRequisitionAdd' })
@@ -163,21 +147,12 @@ const { delView } = useTagsViewStore() // 视图操作
 const { currentRoute, push } = useRouter()
 const deptUsers = ref<UserApi.UserVO[]>([]) // 用户列表
 const dept = ref() // 当前登录人所属部门对象
-const configFormRef = ref() // 配置弹出框对象
-const bomNodeId = ref() // 最新的bomNodeId
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const deviceLabel = ref('') // 表单的类型：create - 新增；update - 修改
-const drawerVisible = ref<boolean>(false)
-const currentBomNodeId = ref() // 当前选中的bom节点
-const showDrawer = ref()
-const list = ref<IotMainWorkOrderBomVO[]>([]) // 保养工单bom关联列表的数据
 const materialList = ref<IotMaterialRequisitionDetailVO[]>([]) // 领用单明细
-const deviceIds = ref<number[]>([]) // 已经选择的设备id数组
 const { params, name } = useRoute() // 查询参数
 const id = params.id
-const devicePersonsMap = ref<Map<number, Set<string>>>(new Map()) // 存储设备-责任人映射
 
 const formData = ref({
   id: undefined,
@@ -198,12 +173,6 @@ const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
 
-interface MaterialFormExpose {
-  open: (deptId: number, bomNodeId: number) => void
-}
-
-const materialFormRef = ref<MaterialFormExpose>();
-
 // 监听物料列表变化
 watch(
   () => materialList.value,
@@ -231,19 +200,15 @@ const calculateTotalCost = () => {
   formData.value.cost = (materialTotal).toFixed(2)
 }
 
-/** 查看已经选择的物料 并编辑 */
-const handleView = (nodeId) => {
-  currentBomNodeId.value = nodeId
-  drawerVisible.value = true
-  // showDrawer.value.openDrawer()
-  console.log('当前bom节点：', currentBomNodeId.value)
-}
-
 // 多选 物料
 const stockChoose = (selectedStocks) => {
   // 转换数据结构（根据你的接口定义调整）
   const newItems = selectedStocks.map(stock => ({
     id: stock.id,
+    factoryId: stock.factoryId,
+    factory: stock.factory,
+    costCenterId: stock.costCenterId,
+    costCenter: stock.costCenter,
     materialCode: stock.materialCode,
     materialName: stock.materialName,
     unit: stock.unit,
@@ -311,14 +276,12 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = {
-      mainWorkOrder: formData.value,
-      mainWorkOrderBom: list.value,
-      mainWorkOrderMaterials: materialList.value
+      materialRequisition: formData.value,
+      materialReqDetails: materialList.value
     }
-    await IotMainWorkOrderApi.addWorkOrder(data)
+    await IotMaterialRequisitionApi.addMaterialRequisition(data)
     message.success(t('common.createSuccess'))
     close()
-
     // 发送操作成功的事件
     emit('success')
   } finally {
@@ -331,11 +294,11 @@ const validateTableData = (): boolean => {
   let isValid = true
   const errorMessages: string[] = []
 
-  if (list.value.length === 0) {
-    errorMessages.push('请至少添加一条设备保养明细')
+  if (materialList.value.length === 0) {
+    errorMessages.push('请至少添加一条物料明细')
     isValid = false
     // 直接返回无需后续校验
-    message.error('请至少添加一条设备保养明细')
+    message.error('请至少添加一条物料明细')
     return isValid
   }
   return isValid
@@ -362,38 +325,26 @@ onMounted(async () => {
   // 查询当前登录人所属部门名称
   dept.value = await DeptApi.getDept(deptId)
   formData.value.name = dept.value.name + ' - 领料单'
-  deptUsers.value = await UserApi.getDeptUsersByDeptId(deptId)
   formData.value.deptId = deptId
   try {
     formType.value = 'create'
-    const { wsCache } = useCache()
-    const userInfo = wsCache.get(CACHE_KEY.USER)
   } catch (error) {
     console.error('数据加载失败:', error)
     message.error('数据加载失败，请重试')
   }
 })
 
-const handleDelete = async (str: string) => {
+const handleDelete = async (materialCode: string) => {
   try {
-    const [deviceIdStr, bomNodeId] = str.split('-')
-    const deviceId = parseInt(deviceIdStr)
-    // 删除列表项
-    const index = list.value.findIndex((item) => (item.deviceId+'-'+item.bomNodeId) === str)
+    // 从 materialList 中移除对应物料
+    const index = materialList.value.findIndex(item => item.materialCode === materialCode);
     if (index !== -1) {
-      list.value.splice(index, 1)
-      deviceIds.value = []
-    }
-    // 更新设备ID列表（需要检查是否还有该设备的其他项）
-    const hasOtherItems = list.value.some(item => item.deviceId === deviceId)
-    if (!hasOtherItems) {
-      deviceIds.value = deviceIds.value.filter(id => id !== deviceId)
-      devicePersonsMap.value.delete(deviceId) // 移除对应设备的责任人
+      materialList.value.splice(index, 1);
+      calculateTotalCost(); // 重新计算总费用
     }
-    // message.success('移除成功')
   } catch (error) {
-    console.error('移除失败:', error)
-    message.error('移除失败')
+    console.error('移除失败:', error);
+    message.error('移除失败');
   }
 }
 

src/views/pms/iotmaterialrequisition/SelectLocalStock.vue

@@ -114,6 +114,7 @@ import {DICT_TYPE} from "@/utils/dict";
 import {ContentWrap} from "@/components/ContentWrap";
 import {IotSapStockApi, IotSapStockVO} from "@/api/pms/iotsapstock";
 import {IotLockStockApi, IotLockStockVO} from "@/api/pms/iotlockstock";
+import {useUserStore} from "@/store/modules/user";
 const { t } = useI18n() // 国际化
 // 调整 emit 类型
 const emit = defineEmits<{
@@ -132,6 +133,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   label: '',
+  deptId: undefined,
   materialName: undefined,
   materialCode: undefined,
   status: undefined,
@@ -193,7 +195,9 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const getList = async () => {
   loading.value = true
   try {
-    // const data = await SapStockApi.IotSapStockApi.getIotSapStockPage(queryParams)
+    // 查询当前登录人所在部门关联的本地库存
+    const deptId = useUserStore().getUser.deptId
+    queryParams.deptId = deptId;
     const data = await IotLockStockApi.getIotLockStockPage(queryParams)
     list.value = data.list
     total.value = data.total

src/views/pms/iotmaterialrequisition/index.vue

@@ -68,6 +68,14 @@
       />
       <el-table-column label="操作" align="center" min-width="120px">
         <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="detail(scope.row.id)"
+            v-hasPermi="['pms:iot-material-requisition:query']"
+          >
+            {{ t('operationFill.view')  }}
+          </el-button>
           <el-button
             link
             type="primary"
@@ -180,6 +188,10 @@ const openForm = (type: string, id?: number) => {
   }
 }
 
+const detail = (id?: number) => {
+  push({ name: 'IotMaterialReqDetail', params:{id} })
+}
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {

src/views/pms/iotprojectinfo/IotProjectInfoForm.vue

@@ -0,0 +1,653 @@
+<template>
+  <ContentWrap v-loading="formLoading">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="客户名称" prop="manufacturerId">
+            <el-select
+              clearable
+              @clear="zzClear"
+              v-model="formData.manufactureName"
+              :placeholder="t('deviceForm.mfgHolder')"
+              @click="openCustomerZz"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="结算方式" prop="payment">
+            <el-input v-model="formData.payment" placeholder="请输入结算方式" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="合同名称" prop="contractName">
+            <el-input v-model="formData.contractName" placeholder="请输入合同名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="合同编号" prop="contractCode">
+            <el-input v-model="formData.contractCode" placeholder="请输入合同编号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="总数" prop="workloadTotal">
+            <el-input v-model="formData.workloadTotal" placeholder="请输入工作量总数" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="已完成" prop="workloadFinish">
+            <el-input v-model="formData.workloadFinish" placeholder="已完成工作量" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker
+              style="width: 150%"
+              v-model="formData.startTime"
+              type="date"
+              value-format="x"
+              placeholder="选择开始时间"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="完成时间" prop="endTime">
+            <el-date-picker
+              style="width: 150%"
+              v-model="formData.endTime"
+              type="date"
+              value-format="x"
+              placeholder="选择完成时间"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+<!--      <el-row>
+        <el-col :span="12">
+          <el-form-item label="施工地点" prop="location">
+            <el-input v-model="formData.location" placeholder="请输入施工地点" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="施工工艺" prop="technique">
+            <el-input v-model="formData.technique" placeholder="请输入施工工艺" />
+          </el-form-item>
+        </el-col>
+      </el-row>-->
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" />
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+<!--  <ContentWrap>
+    <el-form>
+      <el-button
+        type="primary"
+        plain
+        @click="openForm('create')"
+        v-hasPermi="['rq:iot-project-info:create']"
+      >
+        <Icon icon="ep:plus" class="mr-5px" />任务拆分
+      </el-button>
+    </el-form>
+    <el-table v-loading="loading" :data="taskList" :stripe="true" :show-overflow-tooltip="true">
+      &lt;!&ndash; 添加序号列 &ndash;&gt;
+      <el-table-column
+        type="index"
+        label="序号"
+        width="60"
+        align="center"
+      />
+      <el-table-column label="井号" align="center" prop="wellName" />
+      <el-table-column label="井型/井别" align="center" prop="wellType" />
+      <el-table-column label="施工地点" align="center" prop="location" />
+      <el-table-column label="施工工艺" align="center" prop="technique" />
+      <el-table-column label="设计工作量" align="center" prop="workloadDesign" />
+      <el-table-column label="所属队伍" align="center" prop="deptList" />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <div style="display: flex; justify-content: center; align-items: center; width: 100%">
+            &lt;!&ndash; 新增配置按钮 &ndash;&gt;
+            <div style="margin-left: 12px">
+              <el-button
+                link
+                type="primary"
+                @click="openConfigDialog(scope.row)"
+              >
+                推迟保养
+              </el-button>
+            </div>
+            <div style="margin-left: 12px">
+              <el-button
+                link
+                type="primary"
+                @click="openMaterialForm(scope.row)"
+              >
+                选择物料
+              </el-button>
+            </div>
+            <div style="margin-left: 12px">
+              <el-button
+                link
+                type="primary"
+                @click="handleView(scope.row.bomNodeId)"
+              >
+                物料详情
+              </el-button>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+  </ContentWrap>-->
+
+  <CustomerList ref="customerZzFormRef" @choose="customerZzChoose" />
+<!--  <IotProjectTaskForm ref="formRef1" @success="getList" />-->
+  <ContentWrap>
+    <div class="content">
+      <div class="toolbar">
+        <div class="actions">
+          <el-button type="primary" @click="addNewRow" icon="plus" >
+            新增行
+          </el-button>
+          <el-button type="success" @click="saveAll" :disabled="editingRowsCount === 0" icon="check">
+            保存所有更改
+          </el-button>
+        </div>
+      </div>
+
+      <div class="table-container">
+        <el-table :data="tableData" :row-class-name="rowClassName" empty-text="暂无数据">
+<!--          <el-table-column prop="id" label="ID" width="80">
+            <template #default="{ row }">
+              <span v-if="!row.editing">{{ row.id }}</span>
+              <el-input v-else v-model="row.editData.id" disabled class="edit-input" />
+            </template>
+          </el-table-column>-->
+
+          <el-table-column prop="wellName" label="井号">
+            <template #default="{ row }">
+              <span v-if="!row.editing">{{ row.wellName }}</span>
+              <div v-else>
+                <el-input v-model="row.editData.wellName" class="edit-input" placeholder="请输入井号" />
+                <div v-if="row.errors.wellName" class="error-message">{{ row.errors.wellName }}</div>
+              </div>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="wellType" label="井型/井别">
+            <template #default="{ row }">
+              <span v-if="!row.editing">{{ row.wellType }}</span>
+              <div v-else>
+                <el-input v-model="row.editData.wellType" class="edit-input" placeholder="请输入井型/井别" />
+                <div v-if="row.errors.wellType" class="error-message">{{ row.errors.wellType }}</div>
+              </div>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="location" label="施工地点" >
+            <template #default="{ row }">
+              <span v-if="!row.editing">{{ row.location }}</span>
+              <div v-else>
+                <el-input v-model="row.editData.location" class="edit-input" placeholder="请输入施工地点" />
+                <div v-if="row.errors.location" class="error-message">{{ row.errors.location }}</div>
+              </div>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="technique" label="施工工艺" >
+            <template #default="{ row }">
+              <span v-if="!row.editing">{{ row.technique }}</span>
+              <div v-else>
+                <el-input v-model="row.editData.technique" class="edit-input" placeholder="请输入施工工艺" />
+                <div v-if="row.errors.technique" class="error-message">{{ row.errors.technique }}</div>
+              </div>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="workloadDesign" label="设计工作量">
+            <template #default="{ row }">
+              <span v-if="!row.editing">{{ row.workloadDesign }}</span>
+              <div v-else>
+                <el-input v-model="row.editData.workloadDesign" class="edit-input" placeholder="请输入设计工作量" />
+                <div v-if="row.errors.workloadDesign" class="error-message">{{ row.errors.workloadDesign }}</div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="deptIds" label="所属队伍" >
+            <template #default="{ row }">
+              <span v-if="!row.editing">
+                {{ getDeptNames(row.deptIds) }}
+              </span>
+              <div v-else>
+                <el-tree-select
+                  multiple
+                  v-model="row.editData.deptIds"
+                  :data="deptList"
+                  :props="defaultProps"
+                  check-strictly
+                  node-key="id"
+                  filterable
+                  placeholder="请选择所在部门"
+                  clearable
+                />
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="200" fixed="right">
+            <template #default="{ row, $index }">
+              <div class="action-cell">
+                <template v-if="!row.editing">
+                  <el-button size="small" type="primary" @click="editRow(row)" icon="edit">编辑</el-button>
+                  <el-button size="small" type="danger" @click="deleteRow($index)" icon="delete">删除</el-button>
+                </template>
+                <template v-else>
+                  <el-button size="small" type="success" @click="saveRow(row)" icon="check">保存</el-button>
+                  <el-button size="small" @click="cancelEdit(row)" icon="close">取消</el-button>
+                </template>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </ContentWrap>
+  <ContentWrap>
+    <el-form style="float: right">
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="close">取 消</el-button>
+    </el-form>
+  </ContentWrap>
+</template>
+<script setup lang="ts">
+import { IotProjectInfoApi, IotProjectInfoVO } from '@/api/pms/iotprojectinfo'
+import {defaultProps,handleTree} from "@/utils/tree";
+import * as DeptApi from "@/api/system/dept";
+import IotProjectTaskForm from '@/views/pms/iotprojectinfo/IotProjectTaskForm.vue'
+import CustomerList from '@/views/pms/device/CustomerList.vue'
+import {ref} from "vue";
+/** 项目信息 表单 */
+defineOptions({ name: 'IotProjectInfo' })
+const { params, name } = useRoute() // 查询参数
+import {useUserStore} from "@/store/modules/user";
+import {IotProjectTaskApi, IotProjectTaskVO} from "@/api/pms/iotprojecttask";
+import {ElMessageBox} from "element-plus";
+import {updateConfig} from "@/api/infra/config";
+import {useTagsViewStore} from "@/store/modules/tagsView";
+const id = params.id
+const { delView } = useTagsViewStore() // 视图操作
+const { currentRoute, push } = useRouter()
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const deptList = ref<Tree[]>([]) // 树形结构
+const dialogVisible = ref(true) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const taskList = ref<IotProjectTaskVO[]>([]) // 列表的数据
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const loading = ref(true) // 列表的加载中
+const formData = ref({
+  id: undefined,
+  deptId: undefined,
+  deptName: undefined,
+  contractName: undefined,
+  contractCode: undefined,
+  workloadTotal: undefined,
+  workloadFinish: undefined,
+  startTime: undefined,
+  endTime: undefined,
+  location: undefined,
+  technique: undefined,
+  payment: undefined,
+  userName: useUserStore().getUser.name,
+  userId: useUserStore().getUser.userId,
+})
+const close = () => {
+  delView(unref(currentRoute))
+  push({ name: 'iotProjectInfo', params:{}})
+}
+
+const queryParams = reactive({
+  projectId:undefined
+})
+const formRules = reactive({
+  manufacturerId: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
+  payment: [{ required: true, message: '结算方式不能为空', trigger: 'blur' }],
+  contractName: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }],
+  contractCode: [{ required: true, message: '合同编码不能为空', trigger: 'blur' }],
+  workloadTotal: [{ required: true, message: '工作量总数不能为空', trigger: 'blur' }],
+  startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
+  endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
+})
+const formRef1 = ref() // 表单 Ref
+const openForm = (type: string, id?: number) => {
+  formRef1.value.open(type, id)
+}
+const zzClear = () =>{
+  formData.value.manufacturerId = undefined
+  formData.value.manufactureName = undefined
+}
+
+const customerZzChoose = (row) => {
+  formData.value.manufacturerId = row.id
+  // zzLabel.value = row.name
+  formData.value.manufactureName = row.name
+}
+const customerZzFormRef = ref()
+const openCustomerZz = () => {
+  customerZzFormRef.value.open()
+}
+// 根据部门ID获取部门名称
+const getDeptNames = (deptIds) => {
+  if (!deptIds || deptIds.length === 0) return '';
+
+  const names = [];
+  const findDept = (list, id) => {
+    for (const item of list) {
+      if (item.id === id) {
+        names.push(item.name);
+        return true;
+      }
+      if (item.children && findDept(item.children, id)) {
+        return true;
+      }
+    }
+    return false;
+  };
+
+  deptIds.forEach(id => findDept(deptList.value, id));
+  return names.join(', ');
+};
+
+const taskInfo = ref({
+  id: 1,
+  wellName: '',
+  wellType: '',
+  location: '',
+  technique: '',
+  workloadDesign: '',
+  deptIds: [],
+  editData: {},
+  editing:true,
+  originalData: {},
+  errors: {}
+})
+const tableData = ref([
+  {
+    id: 1,
+    wellName: '',
+    wellType: '',
+    location: '',
+    technique: '',
+    workloadDesign: '',
+    deptIds: [],
+    editData: {},
+    editing:true,
+    originalData: {},
+    errors: {}
+  },
+]);
+let deptInfo: any[] = "";
+/** 打开弹窗 */
+const open = async () => {
+ /* dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type*/
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formType.value = 'update';
+    formLoading.value = true
+    try {
+      formData.value = await IotProjectInfoApi.getIotProjectInfo(id)
+      queryParams.projectId = id;
+      const data = await IotProjectTaskApi.getIotProjectTaskPage(queryParams);
+      tableData.value = data.list
+      tableData.value.forEach(item=>{
+        item.deptIds = [167,168];
+        item.editData={};
+        item.originalData={};
+        item.errors={};
+      })
+    } finally {
+      formLoading.value = false
+    }
+  }else{
+    formType.value = 'create';
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const formRef = ref() // 表单 Ref
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = {
+      projectData: formData.value as unknown as IotProjectInfoVO,
+      taskList:tableData.value
+    }
+    if (formType.value === 'create') {
+      await IotProjectInfoApi.createIotProjectInfo(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await IotProjectInfoApi.updateIotProjectInfo(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+    close()
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    deptId: undefined,
+    deptName: undefined,
+    contractName: undefined,
+    contractCode: undefined,
+    workloadTotal: undefined,
+    workloadFinish: undefined,
+    startTime: undefined,
+    endTime: undefined,
+    location: undefined,
+    technique: undefined,
+    payment: undefined,
+    userName: undefined,
+    userId: undefined,
+  }
+  formRef.value?.resetFields()
+}
+onMounted(async () => {
+  deptList.value = handleTree(await DeptApi.getSimpleDeptList())
+  open();
+})
+
+const showCloumn = false;
+// 表格数据
+
+// 计算正在编辑的行数
+const editingRowsCount = computed(() => {
+  return tableData.value.filter(row => row.editing).length;
+});
+
+// 格式化日期
+const formatDate = (timestamp) => {
+  const date = new Date(timestamp);
+  return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
+};
+
+// 为编辑中的行添加特殊样式
+const rowClassName = ({ row }) => {
+  return row.editing ? 'editable-row' : '';
+};
+
+// 添加新行
+const addNewRow = () => {
+  const newId = tableData.value.length > 0
+    ? Math.max(...tableData.value.map(item => item.id)) + 1
+    : 1;
+
+  const newRow = {
+    id: newId,
+    wellName: '',
+    wellType: '',
+    location: '',
+    technique: '',
+    workloadDesign: '',
+    deptIds: [],
+    editing: true,
+    editData: {
+      wellName: '',
+      wellType: '',
+      location: '',
+      technique: '',
+      workloadDesign: '',
+      deptList: {},
+    },
+    originalData: {},
+    errors: {}
+  };
+
+  tableData.value.unshift(newRow);
+};
+
+// 编辑行
+const editRow = (row) => {
+  // 保存原始数据用于取消编辑时恢复
+  row.originalData = {...row};
+  // 设置编辑数据
+  row.editData = {
+    id: row.id,
+    wellName: row.wellName,
+    wellType: row.wellType,
+    location: row.location,
+    technique: row.technique,
+    workloadDesign: row.workloadDesign,
+    deptIds: row.deptIds,
+  };
+  // 进入编辑状态
+  row.editing = true;
+  // 清空错误信息
+  row.errors = {};
+};
+
+// 验证行数据
+const validateRow = (row) => {
+  row.errors = {};
+  let valid = true;
+
+  if (!row.editData.wellName || row.editData.wellName.trim() === '') {
+    row.errors.name = '井号不能为空';
+    valid = false;
+  }
+
+  if (!row.editData.wellType || row.editData.wellType.trim() === '') {
+    row.errors.email = '井型不能为空';
+    valid = false;
+  }
+
+  return valid;
+};
+
+// 保存行
+const saveRow = (row) => {
+  if (!validateRow(row)) return;
+
+  // 将编辑数据应用到行
+  row.id = row.editData.id;
+  row.wellName = row.editData.wellName;
+  row.wellType = row.editData.wellType;
+  row.location = row.editData.location;
+  row.technique = row.editData.technique;
+  row.workloadDesign = row.editData.workloadDesign;
+  row.deptIds = row.editData.deptIds;
+  // 退出编辑状态
+  row.editing = false;
+};
+
+// 保存所有更改
+const saveAll = () => {
+  let allValid = true;
+
+  // 验证所有编辑中的行
+  tableData.value.forEach(row => {
+    if (row.editing && !validateRow(row)) {
+      allValid = false;
+    }
+  });
+
+  if (!allValid) {
+    ElMessage.error('部分数据验证失败，请检查输入');
+    return;
+  }
+
+  // 保存所有编辑中的行
+  tableData.value.forEach(row => {
+    if (row.editing) {
+      row.id = row.editData.id;
+      row.wellName = row.editData.wellName;
+      row.wellType = row.editData.wellType;
+      row.location = row.editData.location;
+      row.technique = row.editData.technique;
+      row.workloadDesign = row.editData.workloadDesign;
+      row.deptIds = row.editData.deptIds;
+    }
+  });
+
+  ElMessage.success('所有更改已保存');
+};
+
+// 取消编辑
+const cancelEdit = (row) => {
+  // 恢复原始数据
+  if (row.originalData.id) {
+    row.id = row.originalData.id;
+    row.wellName = row.originalData.wellName;
+    row.wellType = row.originalData.wellType;
+    row.location = row.originalData.location;
+    row.technique = row.originalData.technique;
+    row.workloadDesign = row.originalData.workloadDesign;
+    row.deptIds = row.originalData.deptIds;
+  } else {
+    // 如果是新增行，则删除
+    const index = tableData.value.indexOf(row);
+    if (index !== -1) {
+      tableData.value.splice(index, 1);
+    }
+  }
+
+  row.editing = false;
+};
+
+// 删除行
+const deleteRow = (index) => {
+  tableData.value.splice(index, 1);
+  ElMessage.success('行已删除');
+};
+
+
+</script>

src/views/pms/iotprojectinfo/IotProjectTaskForm.vue

@@ -0,0 +1,145 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="井号" prop="wellName">
+            <el-input v-model="formData.wellName" placeholder="请输入井号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="井型/井别" prop="wellType">
+            <el-select v-model="formData.wellType" placeholder="请选择井型/井别">
+              <el-option label="请选择字典生成" value="" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="施工地点" prop="location">
+            <el-input v-model="formData.location" placeholder="请输入施工地点" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="施工工艺" prop="technique">
+            <el-input v-model="formData.technique" placeholder="请输入施工工艺" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="设计工作量" prop="workloadDesign">
+            <el-input v-model="formData.workloadDesign" placeholder="请输入设计工作量" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属队伍" prop="workloadDesign">
+            <el-input v-model="formData.workloadDesign" placeholder="请输入设计工作量" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea"/>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { IotProjectTaskApi, IotProjectTaskVO } from '@/api/pms/iotprojecttask'
+
+/** 项目信息任务拆分 表单 */
+defineOptions({ name: 'IotProjectTaskForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  projectId: undefined,
+  wellName: undefined,
+  wellType: undefined,
+  location: undefined,
+  technique: undefined,
+  workloadDesign: undefined,
+  userName: undefined,
+  userId: undefined,
+  remark: undefined,
+})
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await IotProjectTaskApi.getIotProjectTask(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as IotProjectTaskVO
+    if (formType.value === 'create') {
+      await IotProjectTaskApi.createIotProjectTask(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await IotProjectTaskApi.updateIotProjectTask(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    projectId: undefined,
+    wellName: undefined,
+    wellType: undefined,
+    location: undefined,
+    technique: undefined,
+    workloadDesign: undefined,
+    userName: undefined,
+    userId: undefined,
+    remark: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/pms/iotprojectinfo/index.vue

@@ -0,0 +1,249 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="客户名称" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入客户名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="合同名称" prop="contractName">
+        <el-input
+          v-model="queryParams.contractName"
+          placeholder="请输入合同名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="合同编号" prop="contractCode">
+        <el-input
+          v-model="queryParams.contractCode"
+          placeholder="请输入合同编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="起止日期" prop="startTime">
+        <el-date-picker
+          v-model="queryParams.startTime"
+          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>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create',undefined)"
+          v-hasPermi="['rq:iot-project-info:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['rq:iot-project-info:export']"
+        >
+          <Icon icon="ep:download" 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">
+      <el-table-column :label="t('iotDevice.serial')" width="70" align="center">
+        <template #default="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="客户名称" align="center" prop="manufactureName" />
+      <el-table-column label="合同名称" align="center" prop="contractName" />
+      <el-table-column label="合同编号" align="center" prop="contractCode" />
+      <el-table-column label="工作量" align="center">
+        <el-table-column label="总数" align="center" prop="workloadTotal" />
+        <el-table-column label="完成" align="center" prop="workloadFinish" />
+      </el-table-column>
+      <el-table-column label="合同起止时间" align="center">
+        <el-table-column
+          label="开始时间"
+          align="center"
+          prop="startTime"
+          :formatter="dateFormatter2"
+          width="180px"
+        />
+        <el-table-column
+          label="完成时间"
+          align="center"
+          prop="endTime"
+          :formatter="dateFormatter2"
+          width="180px"
+        />
+      </el-table-column>
+<!--      <el-table-column label="施工地点" align="center" prop="location" />
+      <el-table-column label="施工工艺" align="center" prop="technique" />-->
+      <el-table-column label="结算方式" align="center" prop="payment" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['rq:iot-project-info:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['rq:iot-project-info:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { IotProjectInfoApi, IotProjectInfoVO } from '@/api/pms/iotprojectinfo'
+import IotProjectInfoForm from './IotProjectInfoForm.vue'
+
+/** 项目信息 列表 */
+defineOptions({ name: 'iotProjectInfo' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<IotProjectInfoVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  deptId: undefined,
+  deptName: undefined,
+  contractName: undefined,
+  contractCode: undefined,
+  workloadTotal: undefined,
+  workloadFinish: undefined,
+  startTime: [],
+  endTime: [],
+  location: undefined,
+  technique: undefined,
+  payment: undefined,
+  createTime: [],
+  userName: undefined,
+  userId: undefined,
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const { push } = useRouter() // 路由跳转
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await IotProjectInfoApi.getIotProjectInfoPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  //formRef.value.open(type, id)
+  if(id===undefined){
+    push({ name: 'IotProjectInfo', params: { type} })
+  }else{
+    push({ name: 'IotProjectInfo', params: { type,id} })
+  }
+
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await IotProjectInfoApi.deleteIotProjectInfo(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await IotProjectInfoApi.exportIotProjectInfo(queryParams)
+    download.excel(data, '项目信息.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>