Browse Source

pms 选择物料功能优化

zhangcl 3 tháng trước cách đây
mục cha
commit
a0294e5acc

+ 1 - 6
src/views/pms/iotmainworkorder/IotMainWorkOrder.vue

@@ -393,8 +393,6 @@
   />
 </template>
 <script setup lang="ts">
-import { IotMaintainApi, IotMaintainVO } from '@/api/pms/maintain'
-import { IotDeviceApi, IotDeviceVO } from '@/api/pms/device'
 import * as UserApi from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
 import { ref } from 'vue'
@@ -402,11 +400,8 @@ 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 { IotMaintenancePlanApi, IotMaintenancePlanVO } from '@/api/pms/maintenance'
 import { IotMainWorkOrderApi, IotMainWorkOrderVO } from '@/api/pms/iotmainworkorder'
 import { useTagsViewStore } from '@/store/modules/tagsView'
-import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
-import MainPlanDeviceList from "@/views/pms/maintenance/MainPlanDeviceList.vue";
 import * as DeptApi from "@/api/system/dept";
 import {erpPriceTableColumnFormatter} from "@/utils";
 import dayjs from 'dayjs'
@@ -520,7 +515,7 @@ const openConfigDialog = (row: IotMainWorkOrderBomVO) => {
 const openMaterialForm = (row: any) => {
   bomNodeId.value = row.bomNodeId;
   console.log('这是一个对象:', row.bomNodeId)
-  materialFormRef.value.open(formData.value.deptId, bomNodeId.value)
+  materialFormRef.value.open(formData.value.deptId, bomNodeId.value, row.deviceId)
 }
 
 const selectChoose = (selectedMaterial) => {

+ 46 - 2
src/views/pms/iotmainworkorder/WorkOrderMaterial.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" title="选择物料" style="width: 1100px; min-height: 400px">
+  <Dialog v-model="dialogVisible" title="选择物料" style="width: 1200px; min-height: 400px">
     <ContentWrap>
       <el-form
         class="-mb-15px"
@@ -55,6 +55,48 @@
             />
           </template>
         </el-table-column>
+        <el-table-column
+          label="工厂"
+          align="center"
+          prop="factoryId"
+          class="!w-100px"
+          v-if="false"
+        />
+        <el-table-column
+          label="工厂"
+          align="center"
+          prop="factory"
+          :show-overflow-tooltip="true"
+          class="!w-100px"
+        />
+        <el-table-column
+          label="成本中心"
+          align="center"
+          prop="costCenterId"
+          class="!w-100px"
+          v-if="false"
+        />
+        <el-table-column
+          label="成本中心"
+          align="center"
+          prop="costCenter"
+          :show-overflow-tooltip="true"
+          class="!w-100px"
+        />
+        <el-table-column
+          label="库存地点"
+          align="center"
+          prop="storageLocationId"
+          class="!w-100px"
+          v-if="false"
+        />
+        <el-table-column
+          label="库存地点"
+          align="center"
+          prop="projectDepartment"
+          :show-overflow-tooltip="true"
+          class="!w-100px"
+        />
         <el-table-column
           label="物料编码"
           align="center"
@@ -124,6 +166,7 @@ const queryParams = reactive({
   pageSize: 10,
   deptId: 0,
   bomNodeId: 0,
+  deviceId: 0,
   name: '',
   code: ''
 })
@@ -159,12 +202,13 @@ const removeOnesFromKeys = (obj: Record<string, any>) => {
 const handleRowClick = (row) => {
   toggleRow(row)
 }
-const open = async (deptId: number, bomNodeId: number) => {
+const open = async (deptId: number, bomNodeId: number, deviceId: number) => {
   console.log('传递过来的数据:', deptId)
   selectedRows.value = []
   dialogVisible.value = true
   queryParams.deptId = deptId
   queryParams.bomNodeId = bomNodeId
+  queryParams.deviceId = deviceId
   await getList()
 }