演示更改

src/api/process/index.ts

@@ -33,7 +33,7 @@ export function getScan(data: any) {
 }
 export function carCall(data: any) {
   return request({
-    url: "/api/v1/test/callMaterial",
+    url: "/api/v1/test/callMaterial1",
     method: "post",
     data: data,
   });
@@ -48,7 +48,7 @@ export function carExtend(data: any) {
 
 export function carBack(data: any) {
   return request({
-    url: "/api/v1/test/stockIn",
+    url: "/api/v1/test/stockIn1",
     method: "post",
     data: data,
   });

src/components/MessageBox/index.vue

@@ -82,7 +82,7 @@ const reset = () => {
   totalCount.value = 0;
 };
 onMounted(() => {
-  getPageInfo();
+  // getPageInfo();
 });
 watch(
   () => props.modelValue,

src/components/PDFViewFull/index.vue

@@ -184,6 +184,7 @@ const showPdf = () => {
 const showELStatus = ref(false);
 const rendered = () => {
   loading.value = false;
+
   // const clickableElementsA = document.querySelectorAll(".vue-pdf-embed div");
   // const clickableElements = document.querySelectorAll(
   //   ".vue-pdf-embed .vue-pdf-embed__page"

src/layout/index.vue

@@ -21,7 +21,7 @@
       </router-view>
     </section>
     <!-- 左侧消息弹框 -->
-    <RealTimeMsg />
+    <!-- <RealTimeMsg /> -->
   </div>
 </template>
 

src/views/pro-steps/index.vue

@@ -83,7 +83,7 @@
                 "
               >
                 <span @dblclick="fz()">{{
-                  taskArray[taskIndex].workOrderCode
+                  taskArray[taskIndex].orderCode
                 }}</span>
                 /
                 {{ taskArray[taskIndex].planNum }}
@@ -387,7 +387,7 @@
                 class="productitleText"
                 style="font-size: 500; font-size: 24px"
               >
-                {{ item.workOrderCode }} / {{ item.planNum }}
+                {{ item.orderCode }} / {{ item.planNum }}
               </div>
               <div
                 class="productitleText"
@@ -454,7 +454,7 @@
                 class="productitleText"
                 style="font-size: 500; font-size: 24px"
               >
-                {{ item.workOrderCode }} / {{ item.planNum }}
+                {{ item.orderCode }} / {{ item.planNum }}
               </div>
               <div
                 class="productitleText"
@@ -953,7 +953,7 @@
             type="success"
             style="width: 80px; float: right; margin-right: 10px !important"
             :disabled="selectIndexData3 == null"
-            @click="toCall"
+            @click="toCall(tableData3[selectIndexData3].boxCode)"
             >配送</el-button
           >
         </div>
@@ -1048,7 +1048,7 @@
     </div>
     <!-- 操作 -->
     <div class="midPopUp" v-if="popStatus7" @click.stop="popStatus7 = false">
-      <div class="popView" @click.stop style="height: 240px; width: 440px">
+      <div class="popView" @click.stop style="height: 300px; width: 680px">
         <div
           class="hang"
           style="
@@ -1062,7 +1062,7 @@
           请操作内容
         </div>
         <div style="display: flex; justify-content: space-around">
-          <el-popconfirm
+          <!-- <el-popconfirm
             class="box-item"
             title="请确认操作：叫料"
             placement="top"
@@ -1084,28 +1084,34 @@
 
               >
             </template>
-          </el-popconfirm>
-          <el-popconfirm
-            class="box-item"
-            title="请确认操作：回库"
-            placement="top"
-            confirm-button-text="确认"
-            cancel-button-text="取消"
-            @confirm="toBack"
-          >
-            <template #reference>
-              <el-button
-                type="warning"
-                style="
-                  width: 140px;
-                  height: 140px;
-                  font-size: 20px;
-                  border-radius: 16px;
-                "
-                >回库</el-button
-              >
-            </template>
-          </el-popconfirm>
+          </el-popconfirm> -->
+          <div>
+            <el-popconfirm
+              class="box-item"
+              title="请确认操作：回库"
+              placement="top"
+              confirm-button-text="确认"
+              cancel-button-text="取消"
+              @confirm="toBack"
+            >
+              <template #reference>
+                <div style="display: flex; flex-direction: column">
+                  <el-button
+                    type="warning"
+                    style="
+                      width: 140px;
+                      height: 140px;
+                      font-size: 20px;
+                      border-radius: 16px;
+                    "
+                    >回库</el-button
+                  >
+                </div>
+              </template>
+            </el-popconfirm>
+            <el-input v-model="boxNo" style="width: 140px; margin-top: 10px" />
+          </div>
+
           <el-popconfirm
             class="box-item"
             title="请确认操作：伸出"
@@ -1169,6 +1175,7 @@ import PDFViewFull from "@/components/PDFViewFull/index.vue";
 defineOptions({
   name: "ProSteps",
 });
+const boxNo = ref(null);
 const PDFShow = ref(false);
 const baseUrl = import.meta.env.VITE_APP_UPLOAD_URL;
 const cancel = () => {
@@ -1270,32 +1277,44 @@ const tableData2 = ref([
 ]);
 const tableData3 = ref([
   {
-    boxCode: "LX-000123",
+    boxCode: "LX-00003",
     num: 12,
     workOrderCode: "2025.12.125",
     opName: "装配",
   },
   {
-    boxCode: "LX-000123",
+    boxCode: "LX-00004",
     num: 12,
     workOrderCode: "2025.12.125",
     opName: "调试",
   },
 
   {
-    boxCode: "LX-000123",
+    boxCode: "LX-00002",
+    num: 12,
+    workOrderCode: "2025.12.125",
+    opName: "装配",
+  },
+  {
+    boxCode: "LX-00007",
+    num: 12,
+    workOrderCode: "2025.12.125",
+    opName: "装配",
+  },
+  {
+    boxCode: "LX-00005",
     num: 12,
     workOrderCode: "2025.12.125",
     opName: "装配",
   },
   {
-    boxCode: "LX-000123",
+    boxCode: "LX-00006",
     num: 12,
     workOrderCode: "2025.12.125",
     opName: "装配",
   },
   {
-    boxCode: "LX-000123",
+    boxCode: "LX-00010",
     num: 12,
     workOrderCode: "2025.12.125",
     opName: "装配",
@@ -1386,13 +1405,14 @@ const fz = () => {
   const text = taskArray.value[taskIndex.value].workOrderCode;
   copyTextUsingTextarea(text);
 };
-const toCall = async () => {
-  await carCall();
+const toCall = async (no) => {
+  boxNo.value = no;
+  await carCall({ boxNo: boxNo.value });
   ElMessage.success("呼叫成功,请等待");
   popStatus6.value = false;
 };
 const toBack = async () => {
-  await carBack();
+  await carBack({ boxNo: boxNo.value });
   ElMessage.success("操作成功,请等待");
   popStatus6.value = false;
 };
@@ -1553,18 +1573,18 @@ const defaultComponents = [
     name: "Excel",
   },
 
-  {
-    compentName: "设备确认",
-    iconName: "shebeijilu",
-    path: "shebeijilu",
-    name: "Shebeijilu",
-  },
-  {
-    compentName: "检验",
-    iconName: "dianjian",
-    path: "dianjian",
-    name: "Dianjian",
-  },
+  // {
+  //   compentName: "设备确认",
+  //   iconName: "shebeijilu",
+  //   path: "shebeijilu",
+  //   name: "Shebeijilu",
+  // },
+  // {
+  //   compentName: "检验",
+  //   iconName: "dianjian",
+  //   path: "dianjian",
+  //   name: "Dianjian",
+  // },
 ];
 //当前路由在setpComponents中的index
 const selectIndex = ref(null);
@@ -1647,7 +1667,6 @@ watch(
 
 <style lang="scss" scoped>
 .materialInfoBox {
-  width: 400px;
   height: 240px;
   font-size: 18px;
   background-color: #d7d7d7;