Procházet zdrojové kódy

一体机工位任务优化

qinhb před 2 měsíci
rodič
revize
3bc253bc67

+ 20 - 0
src/api/process/index.ts

@@ -19,6 +19,26 @@ export function getOrders(data: any) {
   );
 }
 
+export function queryOpsList(data: any) {
+  return request(
+      {
+        url: "/api/v1/plan/workOrder/queryOps",
+        method: "post",
+        data: data,
+      },
+  );
+}
+export function getTaskWorkOrder(data: any) {
+  return request(
+      {
+        url: "/api/v1/plan/workOrder/taskWorkPage",
+        method: "post",
+        data: data,
+      },
+      { loadingKey: "getProcessOrders" }
+  );
+}
+
 /**
  * 扫码开工
  *

+ 2 - 2
src/components/AddMsg/index.vue

@@ -91,7 +91,7 @@ import { sendMsg, getStationType } from "@/api/process";
 import { emitter, EventsNames } from "@/utils/common";
 import { useDictionaryStore } from "@/store";
 import { useProcessStore } from "@/store/modules/processView";
-import { getOrders } from "@/api/process";
+import { getTaskWorkOrder } from "@/api/process";
 const dictS = useDictionaryStore();
 const store = useProcessStore();
 const route = useRoute();
@@ -137,7 +137,7 @@ const submit = async () => {
   }
 };
 const getOrdersData = async () => {
-  const { code, data } = await getOrders({
+  const { code, data } = await getTaskWorkOrder({
     pageNo: 1,
     pageSize: 999999999,
     queryComplete: 0,

+ 7 - 3
src/views/process/orders.vue

@@ -39,7 +39,7 @@
 <script lang="ts" setup>
 import Order from "@/views/process/components/order.vue";
 import { useCommonStoreHook, useDictionaryStore, useProcessStore } from "@/store";
-import { getOrders } from "@/api/process";
+import { getOrders,getTaskWorkOrder,queryOpsList } from "@/api/process";
 import { emitter, EventsNames } from "@/utils/common";
 import { Search } from "@element-plus/icons-vue";
 
@@ -64,7 +64,7 @@ const ordersQuery = ref({
 const wrapRef = ref(null);
 //获取未完成订单Data
 const getOrdersData = async () => {
-  const { code, data } = await getOrders(ordersQuery.value);
+  const { code, data } = await getTaskWorkOrder(ordersQuery.value);
   if (code == "200") {
     if (ordersQuery.value.pageNo == 1) {
       ordersDataArray.value = data.records;
@@ -99,13 +99,15 @@ const resetOrdersDataArray = async () => {
 const activeName = ref("false");
 //这里是存放控制当前选择工序的index
 const selectIndex = ref(null);
-const setSlectIndex = (index: number) => {
+const setSlectIndex = async (index: number) => {
   // if (selectIndex.value == index) return;
   if (index == null) {
     selectIndex.value = null;
     selectedOderStatus.value = false;
     return;
   }
+  setSlectIndex(null);
+  ordersDataArray.value[index].ops = []
   selectIndex.value = index;
   store.odersData.productLineId = ordersDataArray.value[selectIndex.value].productLineId;
   store.odersData.workOrderCode = ordersDataArray.value[selectIndex.value].workOrderCode;
@@ -118,6 +120,8 @@ const setSlectIndex = (index: number) => {
   store.useSeqNo = "";
   selectSeqArray.value = [];
   selectSeqIndex.value = null;
+  const {code, data} = await queryOpsList({workOrderCode: store.odersData.workOrderCode});
+  ordersDataArray.value[selectIndex.value].ops = data
   emit("getindex", selectIndex.value);
 };
 const handleClick = (tab: TabsPaneContext, event: Event) => {