From f4986444fba227232001480f21d309be900c2992 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Thu, 16 Jul 2026 11:16:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=89=B9=E5=8F=B7?=
 =?UTF-8?q?=E5=BF=85=E4=BC=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasingManagement/beginMaterialSlittedSet.vue |  7 +++++++
 .../purchasingManagement/searchSAPPurchaseOrder.vue  |  7 +++++++
 src/views/modules/shopOrder/shopOrder/shopOrder.vue  | 12 ++++++------
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
index c0d8297..dd0cf06 100644
--- a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
+++ b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
@@ -712,6 +712,13 @@
 
       },
       saveCRoll() {
+        //判断材料供应商批号是否有值
+        if(this.dataForm.suppRollNo==''||this.dataForm.suppRollNo==null){
+          this.$alert(this.labels.suppRollNoAsk, '错误', {
+            confirmButtonText: this.buttons.yes,
+          })
+          return false;
+        }
         if(this.dataForm.checked==false){
           return false;
         }
diff --git a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
index 14e5379..3f93a6c 100644
--- a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
+++ b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
@@ -1197,6 +1197,13 @@ export default {
 
     },
     saveCRoll() {
+      //检查供应商批号是否存在数值
+      if (this.dataForm.suppRollNo == '' || this.dataForm.suppRollNo == null) {
+        this.$alert(this.labels.suppRollNoAsk, '错误', {
+          confirmButtonText: this.buttons.yes
+        })
+        return false;
+      }
       let inData = {
         site: this.dataForm.site,
         partNo: this.dataForm.fGPartNo
diff --git a/src/views/modules/shopOrder/shopOrder/shopOrder.vue b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
index b5e293f..a0d0fcf 100644
--- a/src/views/modules/shopOrder/shopOrder/shopOrder.vue
+++ b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
@@ -679,7 +679,7 @@ export default {
   data() {
     return {
       // 外部打印 JS 的地址配置，后续可修改此地址或提取到配置文件
-      externalPrintJsUrl: 'http://192.168.31.128:9000/print_js/rongxin/print_order.js',
+      externalPrintJsUrl: 'http://localhost:9000/print_js/mes/print_order.js',
       visible: false,
       queryTable: {
         functionId: this.$route.meta.menuId,
@@ -1996,14 +1996,14 @@ export default {
   },
   mounted() {
     // 页面加载时动态引入外部打印 JS，避免每次点击打印都去请求，也无需重包即可更新样式
-    const scriptId = 'external_print_js';
+    const scriptId = 'external_print_order';
     if (!document.getElementById(scriptId)) {
       const script = document.createElement('script');
       script.id = scriptId;
       script.type = 'text/javascript';
       // 添加时间戳防止缓存
       script.src = this.externalPrintJsUrl + '?t=' + new Date().getTime();
-      document.head.appendChild(script);
+     document.head.appendChild(script);
     }
 
     this.$nextTick(() => {
@@ -2221,7 +2221,7 @@ export default {
       if (LODOP && this.orderInfo) {
         //LODOP.SET_LICENSES("", "7B5624CC84E599D6B17F27DF40F4310C", "", "");
         LODOP.NewPage();
-        LODOP.SET_PRINT_PAGESIZE(0, 2400, 1400, "");
+        LODOP.SET_PRINT_PAGESIZE(0, 2100, 1480, "");
         //允许重选纸张方向
         LODOP.SET_PRINT_MODE("RESELECT_ORIENT",true);
         //允许重选纸张大小
@@ -2377,8 +2377,8 @@ export default {
         LODOP.ADD_PRINT_TEXT(towTop, 552, 221, 30, this.dayjs().format('YYYY-MM-DD HH:mm:ss'));
         LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
 
-        //LODOP.PRINT_DESIGN();
-        LODOP.PREVIEW();
+        LODOP.PRINT_DESIGN();
+        //LODOP.PREVIEW();
         //LODOP.PRINT();
         console.log("操作成功！")
       }