From 899352e8e5311f39ae4eeedba4064c02cd8633ad Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Fri, 6 Mar 2026 14:36:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BE=E6=89=8B=E5=85=8D=E8=B4=A3=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/productionManagement/sjKitPreparation.js  |  6 +++---
 src/api/workRate/index.js                         |  2 +-
 .../sinTerWorkOrder/index.vue                     |  3 ++-
 .../sjKitPreparation/index.vue                    | 15 ++++++++-------
 src/views/workRate/index.vue                      | 14 ++++++++------
 vite.config.mjs                                   |  4 ++--
 6 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/api/productionManagement/sjKitPreparation.js b/src/api/productionManagement/sjKitPreparation.js
index 5874e38..b3b6fab 100644
--- a/src/api/productionManagement/sjKitPreparation.js
+++ b/src/api/productionManagement/sjKitPreparation.js
@@ -31,11 +31,11 @@ export const sendKit = (params) => {
 };
 
 
-// 生成车间订单 pdaLoad/loadBigWmsSend
+// 生成车间订单
 export const loadBigWmsSend = (params) => {
   return request({
-    url: '/blade-desk/pdaLoad/loadBigWmsSend',
+    url: '/blade-desk/workOrder/generateWorkOrder',
     method: 'post',
-    data: params,
+    params: params,
   });
 };
\ No newline at end of file
diff --git a/src/api/workRate/index.js b/src/api/workRate/index.js
index 8a5a146..423941a 100644
--- a/src/api/workRate/index.js
+++ b/src/api/workRate/index.js
@@ -1,7 +1,7 @@
 import request from '@/axios';
 export const getOrderDetail = (params) => {
     return request({
-        url: '/blade-desk//workOrder/getOrderDetail',
+        url: '/blade-desk/workOrder/getOrderDetail',
         method: 'get',
         params: params,
     });
diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue
index 8dc1206..d415480 100644
--- a/src/views/productionManagement/sinTerWorkOrder/index.vue
+++ b/src/views/productionManagement/sinTerWorkOrder/index.vue
@@ -52,7 +52,8 @@
         >
       </template>
     </avue-crud>
-    <el-dialog append-to-body v-model="printDialog" title="打印标签">
+    <!-- 打印标签 -->
+    <el-dialog append-to-body v-model="printDialog" title="打印标签" width="20%">
       <el-form ref="printForm" :model="printForm" :rules="printRules">
         <el-form-item label="数量" prop="quantity">
           <el-input
diff --git a/src/views/productionManagement/sjKitPreparation/index.vue b/src/views/productionManagement/sjKitPreparation/index.vue
index 2398a79..058aedb 100644
--- a/src/views/productionManagement/sjKitPreparation/index.vue
+++ b/src/views/productionManagement/sjKitPreparation/index.vue
@@ -38,7 +38,7 @@
           >发送</el-button
         >
         <!-- 车间订单生成 -->
-        <el-button v-if="scope.row.sjKitPreparation == 2" type="text" @click="orderGen(scope.row.id)"
+        <el-button v-if="scope.row.sjKitPreparation == 2" type="text" @click="orderGen(scope.row)"
           >车间订单生成</el-button
         >
       </template>
@@ -91,7 +91,7 @@ export default {
         delBtn: false,
         editBtnText: '修改',
         labelWidth: 120,
-        menuWidth: 120,
+        menuWidth: 140,
         dialogWidth: 900,
         dialogClickModal: false,
         searchEnter: true,
@@ -298,7 +298,7 @@ export default {
         });
     },
     // 车间订单生成
-    orderGen(cardNo) {
+    orderGen(row) {
       this.$confirm('生成车间订单？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
@@ -306,14 +306,15 @@ export default {
       })
         .then(() => {
           this.loading = true;
-          loadBigWmsSend({ yoId: yoId }).then(res => {
+          loadBigWmsSend({ id: row.id }).then(res => {
             this.$message.success('操作成功');
             this.onLoad(this.page, this.query);
           });
         })
-        .catch(() => {
-          this.$message.info('已取消');
-        });
+        // .catch(() => {
+        //   // this.$message.info('已取消');
+        //   this.onLoad(this.page, this.query);
+        // });
     },
 
     searchReset() {
diff --git a/src/views/workRate/index.vue b/src/views/workRate/index.vue
index 9d1d442..e524378 100644
--- a/src/views/workRate/index.vue
+++ b/src/views/workRate/index.vue
@@ -290,16 +290,16 @@ export default {
       type: Boolean,
       default: false,
     },
-    // rowItem: {
-    //   type: Object,
-    //   default: () => {},
-    // },
+    rowItem: {
+      type: Object,
+      default: () => {},
+    },
   },
   components: { contentView },
   data() {
     return {
       selectedItemId: null,
-      rowItem: {},
+      // rowItem: {},
       activeName: '1',
       openShow: false,
       dsPart: {},
@@ -320,7 +320,9 @@ export default {
   mounted() {
     this.openShow = this.showDialog;
     this.height = document.body.clientHeight - 100;
-    // new MoveElement(this.$refs.pointView);
+    console.log(this.rowItem,'rowItem');
+    
+    this.getOrderDetail();
     this.$nextTick(() => {
       const el = this.$refs.pointView;
       if (el) {
diff --git a/vite.config.mjs b/vite.config.mjs
index 15487b6..9216075 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -64,12 +64,12 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.1.5:82',
           // target: "http://192.168.1.4:82",
           // target:'http://49.232.74.228:82',
-          // target: "http://192.168.0.103",
+          target: "http://192.168.0.7",
           //target: 'https://saber3.bladex.cn/api',
           // target: 'http://49.232.74.228:82', 
           // target: "http:192.168.0.220:80",
           // target: 'http:49.232.74.228:49',
-          target: 'http://49.232.74.228:80', //测试环境的地址
+          // target: 'http://49.232.74.228:80', //测试环境的地址
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },